]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ef29498 1c14cfb)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 16 Feb 2007 16:17:04 +0000 (08:17 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 16 Feb 2007 16:17:04 +0000 (08:17 -0800)
commitf8abea8f8c24ecdad6d6861bffb912f23f2741cd
tree7d5af9c3d92b3afd0d585aabd6537db36c8095aetree | snapshot
parentef29498655b18d2bfd69048e20835d19333981abcommit | diff
parent1c14cfbbe7a9f2240c73f420c3c6336fc521cd64commit | diff
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
Linux 2.6 source tree