Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...
authorPaolo Bonzini <pbonzini@redhat.com>
Sat, 29 Mar 2014 14:44:05 +0000 (15:44 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Sat, 29 Mar 2014 14:44:05 +0000 (15:44 +0100)
commit7227fc0666606b0df2c0d2966a7f4859b01bdf74
tree2effa7ffe302b1ef917b29973cb5b3bc9343ce8b
parent6acdb1603a7db4c1b5d91863a13d2c3f1b9188b0
parent72cde5a88d37ba88ad1d47aecf957a9e528636d7
Merge branch 'kvm-ppchv-next' of git://git./linux/kernel/git/paulus/powerpc into kvm-next
arch/powerpc/include/asm/reg.h
arch/powerpc/include/asm/tm.h