Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 21 Oct 2006 20:39:44 +0000 (13:39 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 21 Oct 2006 20:39:44 +0000 (13:39 -0700)
commit946b92437e550d6ed80213bf54a1f383e141aede
treefc7930bdcbd15ddd26f417602595b97dcbae1b74
parent5d6aaf3f6d50f0e12dac42432ceb1c86cd860de6
parent18088748d2a493ce9f6adf0be7f833b04041807e
Merge /pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] uninorth: Add module param 'aperture' for aperture size