]> 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, 27 Sep 2012 05:41:23 +0000 (15:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 05:41:23 +0000 (15:41 +1000)
commit94ed1b20bfb587d2ec19b023e95e9e2c2f199342
tree2d0d64b168c7f28742251d9145a799e617bc1826
parentb7da1fb168cedf0f481f05fa4d9ee9425c3df196
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c