From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Sep 2010 19:25:10 +0000 (-0700)
Subject: Merge git://git.infradead.org/iommu-2.6
X-Git-Tag: v2.6.36-rc6~18
X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=bc5fbd9cc8b72ea591557c1277237a43c65ce775

Merge git://git.infradead.org/iommu-2.6

* git://git.infradead.org/iommu-2.6:
  intel-iommu: Use symbolic values instead of magic numbers in Lenovo w/a
  intel-iommu: Abort IOMMU setup for igfx if BIOS gave no shadow GTT space
---

bc5fbd9cc8b72ea591557c1277237a43c65ce775