]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa69707 7b626ac)
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)
Merge the BIOS workarounds from 2.6.32, and the swiotlb fallback on failure.

1  2 
drivers/pci/dmar.c patch | diff1 | diff2 | blob | history
drivers/pci/intel-iommu.c patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/dmar.c
Simple merge
diff --cc drivers/pci/intel-iommu.c
Simple merge
XArray, radix tree and IDR