]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 05:21:57 +0000 (15:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 05:21:57 +0000 (15:21 +1000)
commit577c8a447952af3f3945c818407150a35a992681
tree443bb09776dce2b3d3d29ddfb62dcee5ad1316d3
parent7e571cab2300f31c80cce948d50081c47ea01bbd
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c