]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 03:23:07 +0000 (14:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 03:23:07 +0000 (14:23 +1100)
commitb71637ed26ef7d7ce0a9cc849de8472e718884b9
treebcb545e353725976039502b36ed69b8f38c7998b
parentba434df8155ad9cbcb4a28f8d1229c1354266407
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c