]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 04:42:51 +0000 (14:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 04:42:51 +0000 (14:42 +1000)
commitb353f3051d6c05da68632dcea825ed445ed8e9b7
tree25f97332a68cc5d6632594a9981d6a5923bb4ed8
parentde63005d06b76ff9a5fceee3613c569ae22d76ef
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c