]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 05:11:03 +0000 (15:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 05:11:03 +0000 (15:11 +1000)
commit2fd83e119431afd7acaee5af578f1b89b48760bf
tree4d03334e2a4b783f35e64296b8e7c2c525036c03
parentec8e6e450843a3f5858f883cf47035c6d025780c
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c