]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'writeback/writeback-for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:45:03 +0000 (15:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:45:03 +0000 (15:45 +1100)
1  2 
fs/btrfs/extent-tree.c
fs/ext4/inode.c
fs/fs-writeback.c
mm/page-writeback.c

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