Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue
authorGleb Natapov <gleb@redhat.com>
Mon, 4 Nov 2013 08:20:57 +0000 (10:20 +0200)
committerGleb Natapov <gleb@redhat.com>
Mon, 4 Nov 2013 08:20:57 +0000 (10:20 +0200)
Conflicts:
arch/powerpc/include/asm/processor.h


Trivial merge