]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 01:27:12 +0000 (12:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 01:27:12 +0000 (12:27 +1100)
commitdfd846643a6ff46993c9017935332a9a1b3d2f1d
treea573071dc1a018f3e53d884c68910c70085b2814
parent082e9b77761dc8710aa9be9d65531e445d7a9290
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c