]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 03:23:06 +0000 (14:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 03:23:06 +0000 (14:23 +1100)
1  2 
drivers/vhost/Kconfig

Simple merge