]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:17:38 +0000 (12:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:17:38 +0000 (12:17 +1000)
commit3ed84be942850c2c75089123acc3d86e214b68f9
tree5718c78d0377003eb552ef9453ae665e6976661d
parenta063a338d6818f2272a3c702cc2ec079c96bbab5
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c