]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 02:33:58 +0000 (12:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 02:33:58 +0000 (12:33 +1000)
1  2 
block/bio.c
drivers/cdrom/cdrom.c

diff --cc block/bio.c
Simple merge
Simple merge