]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Oct 2012 03:05:29 +0000 (14:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Oct 2012 03:05:29 +0000 (14:05 +1100)
commit4892d89084b3e345024cc84caefda432e611469e
tree0e1e15e696222dd76c3aa26921444649fe27ea25
parent412e0c5228de72199ae3a98ca729d1903cfa186c
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c