]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 07:24:59 +0000 (18:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 07:24:59 +0000 (18:24 +1100)
1  2 
arch/arm/kvm/arm.c

Simple merge