]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ext3/for_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 00:46:04 +0000 (10:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 00:46:04 +0000 (10:46 +1000)
1  2 
fs/ext3/super.c
fs/udf/inode.c

diff --cc fs/ext3/super.c
Simple merge
diff --cc fs/udf/inode.c
Simple merge