Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commitec208491936d6adb8a70c3dd4a517cdfe54e823d
authorDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 8 Dec 2009 09:58:33 +0000 (8 09:58 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 8 Dec 2009 09:59:24 +0000 (8 09:59 +0000)
treec7291450e8e559c5fbf3360df30999432204af3c
parentaa697079ee66315c4b9747a5eb3e48487fb1b8be
parent7b626acb8f983eb83b396ab96cc24b18d635d487
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Merge the BIOS workarounds from 2.6.32, and the swiotlb fallback on failure.
drivers/pci/dmar.c
drivers/pci/intel-iommu.c