tree 7d5af9c3d92b3afd0d585aabd6537db36c8095ae
parent ef29498655b18d2bfd69048e20835d19333981ab
parent 1c14cfbbe7a9f2240c73f420c3c6336fc521cd64
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1171642624 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171642624 -0800

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