From: Linus Torvalds Date: Fri, 16 Feb 2007 16:17:04 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart X-Git-Tag: v2.6.21-rc1~94 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f8abea8f8c24ecdad6d6861bffb912f23f2741cd;p=linux-2.6-omap-h63xx.git Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] allow drm populated agp memory types cleanups [AGPGART] intel-agp: Use ARRAY_SIZE macro when appropriate [AGPGART] Add agp-type-to-mask-type method missing from some drivers. [AGPGART] Don't try to remap i810 registers on resume. [AGPGART] Allow drm-populated agp memory types [AGPGART] compat ioctl --- f8abea8f8c24ecdad6d6861bffb912f23f2741cd