]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 's390/features'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 00:31:16 +0000 (10:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 00:31:16 +0000 (10:31 +1000)
1  2 
arch/s390/include/asm/ccwgroup.h
mm/Kconfig

Simple merge
diff --cc mm/Kconfig
Simple merge