]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'writeback/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 04:44:09 +0000 (14:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 04:44:09 +0000 (14:44 +1000)
commitf58905ad63dd79ddd2daac7f8d28cf0e07bf5fe5
tree9a950cb3e5845f6b677a7e7df596fdfe57d02f82
parent785db82660f1486f19113df54bebf9843ac6acb9
parentbcff25fc8aa47a13faff8b4b992589813f7b450a
Merge remote-tracking branch 'writeback/next'

Conflicts:
fs/fs-writeback.c
mm/filemap.c
fs/block_dev.c
fs/ext4/inode.c
fs/fs-writeback.c
fs/inode.c
fs/nfs/write.c
include/trace/events/ext4.h
mm/backing-dev.c
mm/filemap.c
mm/rmap.c