tree fc7930bdcbd15ddd26f417602595b97dcbae1b74
parent 5d6aaf3f6d50f0e12dac42432ceb1c86cd860de6
parent 18088748d2a493ce9f6adf0be7f833b04041807e
author Linus Torvalds <torvalds@g5.osdl.org> 1161463184 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1161463184 -0700

Merge master.kernel.org:/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