]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'md/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 03:58:25 +0000 (13:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 03:58:25 +0000 (13:58 +1000)
1  2 
fs/block_dev.c

diff --cc fs/block_dev.c
Simple merge