Skip to content
Commit 95f328d3 authored by Gleb Natapov's avatar Gleb Natapov
Browse files

Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue 

Conflicts:
	arch/powerpc/include/asm/processor.h
parents daf72722 a78b55d1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment