]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 04:46:07 +0000 (14:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 04:46:07 +0000 (14:46 +1000)
commitac32d56111b014d94a9ce8d82d0769a397778359
treea31132972c6c04b7e50b9d3796f422bcd7428860
parentbc8a146c0e892379f6bb453fe872424d630aa3c4
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c