]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:00:51 +0000 (16:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:00:51 +0000 (16:00 +1100)
commit7f4187102111515e49bfd793be6486fdf8391f38
treeb38eabaade37d967e56d4802c75eb5deb5298080
parent65c76ddacf45303a3c641ba41047f223a49225eb
parent0e9ff68cfd66b15cc80e622c11eff64aae00cba5
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/vhost/Makefile
drivers/vhost/Kconfig
drivers/vhost/Makefile