tree 2f6496ef8354e9a0a315f23faef744f93fee8265
parent daf727225b8abfdfe424716abac3d15a3ac5626a
parent a78b55d1c0218b6d91d504941d20e36435c276f5
author Gleb Natapov <gleb@redhat.com> 1383553257 +0200
committer Gleb Natapov <gleb@redhat.com> 1383553257 +0200

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

Conflicts:
	arch/powerpc/include/asm/processor.h