]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 00:57:55 +0000 (10:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 00:57:55 +0000 (10:57 +1000)
1  2 
arch/arm/include/asm/assembler.h

Simple merge