]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 02:03:10 +0000 (13:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 02:03:10 +0000 (13:03 +1100)
commit9f57531286c3f49523325fa71cf8731b7f9dcda5
treeac56d67b07df0220668108f6ed8064499caa9fff
parentf43966c417156150a570664438154e7cdccaa11b
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c