]> 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, 1 Nov 2012 03:49:16 +0000 (14:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 03:49:16 +0000 (14:49 +1100)
commitc71bcd83a73c357bb095980e8baf38f860f305e2
treed01677af4f3bdf46dcabfe8b9b0b0892116053ce
parentc507e7364ec0efb9e8c87484d2a387fb2893c611
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c