]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 02:38:13 +0000 (13:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 02:38:13 +0000 (13:38 +1100)
commite672b1fe3866b599932a712af151f9faba8869a0
treed6279847fe0fca685100415ae78308ac4f52b0cb
parenteacdaa5eb02fb3ce8a84a5929da72247ca68c0ab
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c