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

1  2 
drivers/pci/intel-iommu.c

Simple merge