]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 04:28:13 +0000 (15:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 04:28:13 +0000 (15:28 +1100)
1  2 
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S

Simple merge