Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Oct 2008 21:29:16 +0000 (14:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Oct 2008 21:29:16 +0000 (14:29 -0700)
commit6106611e15b036bccfb4cfc0ed8bf83aab3ee226
tree84364e663af7f5fbc37a032c57491f06b1d85ae3
parentf1ea7254726d25a333056619ec6b1a8ee1b7358d
parentd99e90164e6cf2eb85fa94d547d6336f8127a107
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: gart iommu have direct mapping when agp is present too