]> 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, 6 Sep 2012 05:21:36 +0000 (15:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 05:21:36 +0000 (15:21 +1000)
commitf9d3c1ee0bd07866371794440bb9868d6c1d49b4
tree7483d4e9a63a36a4216992b8a51ba3a26505b38a
parentce9bf8de13eebec583cd700539f6800d94c96377
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c