Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 8 Aug 2009 10:25:28 +0000 (11:25 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 8 Aug 2009 10:26:15 +0000 (11:26 +0100)
commita131bc185528331451a93db6c50a7d2070376a61
tree18cccd206d4835ee8df147ac3b0c0e30cc00680d
parent19943b0e30b05d42e494ae6fef78156ebc8c637e
parentff1649ff780fb7c0bfbf42d05ffc9b56336b9aa3
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).
drivers/pci/intel-iommu.c