]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 8 Dec 2009 09:58:33 +0000 (09:58 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 8 Dec 2009 09:59:24 +0000 (09:59 +0000)
commit00318a7537d6f7510bb7967bcb4d4615bb8b6473
treec7291450e8e559c5fbf3360df30999432204af3c
parent9d3b32463b4c3830a94b7a8e22781bbccdedbd7a
parentbfc608d250c28e55b0216d44ddb9bca2db04a45c
Merge branch 'master' of git://git.kernel.org/pub/scm/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