]> 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>
Fri, 14 Oct 2011 05:37:46 +0000 (16:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 05:37:46 +0000 (16:37 +1100)
1  2 
fs/buffer.c
fs/ext4/inode.c
fs/quota/quota.c
include/linux/sched.h
kernel/fork.c
mm/vmscan.c

diff --cc fs/buffer.c
Simple merge
diff --cc fs/ext4/inode.c
Simple merge
Simple merge
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc mm/vmscan.c
Simple merge