]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc4e060 ea7bf1d)
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)
Conflicts:
fs/fs-writeback.c

1  2 
mm/backing-dev.c patch | diff1 | diff2 | blob | history

diff --cc mm/backing-dev.c
Simple merge
Linux kernel for KaRo TX COM modules