]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Oct 2012 02:30:54 +0000 (13:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Oct 2012 02:30:54 +0000 (13:30 +1100)
commitc0707e375dfc3b25056934e409eb581fbb5eeb68
tree7636fc1e62e5f987d49fcb225ef58902160f523f
parent92465f29127bf57697d3d0a0e4ce25685a87a519
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c