]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ext3/for_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:51:38 +0000 (09:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:51:38 +0000 (09:51 +1000)
1  2 
fs/ext2/super.c
fs/ext3/super.c
fs/quota/dquot.c
fs/quota/quota.c
fs/udf/namei.c

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