From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 21 Oct 2006 20:39:44 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
X-Git-Tag: MMI-PSA29.97-13-9~45739^2~7^2~95
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=946b92437e550d6ed80213bf54a1f383e141aede;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

946b92437e550d6ed80213bf54a1f383e141aede