From: Linus Torvalds Date: Thu, 8 Feb 2007 18:03:28 +0000 (-0800) Subject: Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied... X-Git-Tag: v2.6.21-rc1~92^2~24 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c0e8caf9fd6c9a49fb9fbdba14a8b7b4239adde;p=linux-2.6 Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: Allow for 44 bit user-tokens (or drm_file offsets) drm/via: Disable AGP DMA for chips with the new 3D engine. drm: update core memory manager from git drm tree drm: remove drm_ioremap and drm_ioremapfree i810/i830: use drm_core_ioremap instead of drm_ioremap drm: use vmalloc_user instead of vmalloc_32 for DRM_SHM via: allow for npot texture pitch alignment via: add some new chipsets via: some PCI posting flushes --- 0c0e8caf9fd6c9a49fb9fbdba14a8b7b4239adde