]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 01:32:14 +0000 (12:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 01:32:14 +0000 (12:32 +1100)
commit60078c6c3e5e3efac0675976334a142f47a257a5
treecdd403f91f8928ce62a07112660fc0b31aff28b1
parent48720ae060d110c054c2ef5b5129244d2ba6b921
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c