]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ext4/dev'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 01:39:12 +0000 (11:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 01:39:12 +0000 (11:39 +1000)
1  2 
fs/ext4/inode.c
fs/ext4/super.c
fs/jbd2/journal.c

diff --cc fs/ext4/inode.c
Simple merge
diff --cc fs/ext4/super.c
Simple merge
Simple merge