]> 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, 8 Nov 2012 03:33:08 +0000 (14:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 03:33:08 +0000 (14:33 +1100)
commit8229c06e2b25163540cc654aaa9e3800672d9889
treed3419d2a00a71a53e424bc1896c95c5543238fc5
parent44a9a4835c8b0c7e09202ca7c0d5ea0df890753f
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c