]> 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, 14 Sep 2012 06:11:19 +0000 (16:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Sep 2012 06:11:19 +0000 (16:11 +1000)
commitd8f0ebd7a0553d9160397cf5e30c2ec851de34e6
tree3ace6c70bd92dd24d0035a1ef303ce679ff15c9b
parent6a499eab6036bf4392bf7226b9ed9b66cde76dcb
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c