]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 02:27:23 +0000 (12:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 02:27:23 +0000 (12:27 +1000)
1  2 
drivers/vhost/scsi.c

Simple merge