From: David Woodhouse Date: Tue, 8 Dec 2009 09:58:33 +0000 (+0000) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ec208491936d6adb8a70c3dd4a517cdfe54e823d;p=linux.git 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. --- ec208491936d6adb8a70c3dd4a517cdfe54e823d