]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 04:41:08 +0000 (15:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 04:41:08 +0000 (15:41 +1100)
Conflicts:
drivers/net/tun.c


Trivial merge