]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'writeback/writeback-for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Nov 2011 03:00:11 +0000 (14:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Nov 2011 03:00:11 +0000 (14:00 +1100)
commitbbc3bf36cd26216daaf4f5560282129f9101ef92
tree8da96111b6c368e7c23439aa565350a3146fde8c
parentcc4e0601a1ca2584bf08bf12ed6103bd41c514f7
parentea7bf1d69161628c13b2dd4ecdfab20369566d4c
Merge remote-tracking branch 'writeback/writeback-for-next'

Conflicts:
fs/fs-writeback.c
mm/backing-dev.c