]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 03:19:43 +0000 (14:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 03:19:43 +0000 (14:19 +1100)
commit1baa8539c8a91fa014f0e33a6903296c17d836e2
treea79f296b183d36736131ca64cc11fa38a023e272
parent92cd2a8617e8e14190c7a0ab962d87a70dc3f1e1
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c