]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 23:09:16 +0000 (10:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 23:09:16 +0000 (10:09 +1100)
1  2 
arch/arm/include/asm/ptrace.h

Simple merge