]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 01:15:56 +0000 (11:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 01:15:56 +0000 (11:15 +1000)
1  2 
Documentation/kernel-parameters.txt
block/blk-core.c

Simple merge
Simple merge