]> 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, 13 Nov 2012 03:56:12 +0000 (14:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 03:56:12 +0000 (14:56 +1100)
commitdacba915b699d304f121c218769315e0d8dbfde7
tree8787164beeb11656626b9b0ac7b3cbd925c83f33
parent4814fef6892a8b46de32061634a7a9a09e3de063
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c