]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'md/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:08:51 +0000 (15:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:08:51 +0000 (15:08 +1000)
1  2 
fs/block_dev.c

diff --cc fs/block_dev.c
Simple merge