Merge git://git.infradead.org/iommu-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2010 19:25:10 +0000 (12:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2010 19:25:10 +0000 (12:25 -0700)
commitbc5fbd9cc8b72ea591557c1277237a43c65ce775
tree804e63e1ac08c4e3324cc1b456f71cf286db98e4
parent6a6aa2b7e47c725b5256ff0f7462fe1247cabf5a
parenteecfd57f6429d9d8e10be186566ef99fced55163
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
drivers/pci/intel-iommu.c