]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ext3/for_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:19:57 +0000 (11:19 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:19:57 +0000 (11:19 +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