tree c7291450e8e559c5fbf3360df30999432204af3c
parent aa697079ee66315c4b9747a5eb3e48487fb1b8be
parent 7b626acb8f983eb83b396ab96cc24b18d635d487
author David Woodhouse <David.Woodhouse@intel.com> 1260266313 +0000
committer David Woodhouse <David.Woodhouse@intel.com> 1260266364 +0000

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.