]> 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>
Tue, 13 Dec 2011 06:04:26 +0000 (17:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 06:04:26 +0000 (17:04 +1100)
1  2 
fs/fs-writeback.c
include/linux/sched.h
kernel/exit.c
kernel/fork.c
mm/filemap.c

Simple merge
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc mm/filemap.c
Simple merge