]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'md/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 03:02:01 +0000 (13:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 03:02:01 +0000 (13:02 +1000)
1  2 
arch/x86/Makefile
crypto/xor.c

Simple merge
diff --cc crypto/xor.c
Simple merge