]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 04:53:48 +0000 (14:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 04:53:48 +0000 (14:53 +1000)
commite13fabf0e2dca98b1e46e15e9ba01148640eb7a4
treebfa92fd9e44d7563ff3f77cecf8722129bc2dd6e
parent4f5b9753829898040337475529a8d7772258aa8e
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c