]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 03:17:19 +0000 (13:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 03:17:19 +0000 (13:17 +1000)
1  2 
drivers/block/virtio_blk.c

Simple merge