]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 06:50:21 +0000 (16:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 06:50:21 +0000 (16:50 +1000)
1  2 
fs/debugfs/inode.c
init/Kconfig

Simple merge
diff --cc init/Kconfig
Simple merge