]> 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, 4 Apr 2013 04:53:46 +0000 (15:53 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 04:53:46 +0000 (15:53 +1100)
commit1f790ecdeca128b4e8f99b3b08fa61a1b630a62f
tree85625909b8b99ed745d4330c295d1d8764146197
parentbe654bfd5913008f39d4d70bdaf030293160188c
parent0e9ff68cfd66b15cc80e622c11eff64aae00cba5
Merge remote-tracking branch 'vhost/linux-next'

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