]> 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, 12 Sep 2012 06:14:06 +0000 (16:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 06:14:06 +0000 (16:14 +1000)
commit4f6ceb6323f51c56e28f6f926c155c15efdd4852
tree96855c8698217614fc423a9e8d2567c3deaf1804
parente0fc4875b41acd9ea40ed7cebee7129e7bdc318f
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c