Skip to content
Commit ec208491 authored by David Woodhouse's avatar David Woodhouse
Browse files

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.
parents aa697079 7b626acb
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment