]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 06:25:20 +0000 (16:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 06:25:20 +0000 (16:25 +1000)
commit72a2242e9cde3adde0abb74d5a7f589a32c2e143
tree4112d067ea7e1210e138dbb4759ce59fb831b69f
parent5bf61ae0c476f2f0ab006b4ac998de5fceb57de6
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c