]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:34:52 +0000 (15:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:34:52 +0000 (15:34 +1100)
commit674bd00ce2fdec26daacb2f9fe3070f6c1ecf0e2
treedcd223bbd430a467cf022892365e75d6f592a885
parent87e11514ebe6f9e047ba85d201f5c67ed4d8cd54
parent0e9ff68cfd66b15cc80e622c11eff64aae00cba5
Merge remote-tracking branch 'vhost/linux-next'

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