]> 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, 24 Aug 2012 06:13:06 +0000 (16:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 06:13:06 +0000 (16:13 +1000)
commitc85b8ead3ce101de1d3242c03de1398244b49183
tree5b844c41127f8bb3a57708a3ab33b6a12a17d765
parent0e66951cf8113d73b863983138e3db693b8075a1
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c