]> 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, 4 Oct 2012 04:22:27 +0000 (14:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 04:22:27 +0000 (14:22 +1000)
commit15a3a85f4cc5a54d70c18033b77e223bc13781a9
tree258852c3b32ce73ae561701db216ac1fbcc2d30b
parenta4a207cdaa535a5b0504cfc05d649aa0d8208c31
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c