]> 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, 31 Oct 2012 04:41:08 +0000 (15:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 04:41:08 +0000 (15:41 +1100)
commit976ab189bcf5cf83dcce7f6b7a5acb3de7fedd0b
tree5c621f8012fee7e0b7ec02a0aeb83802c50382d6
parent6aa03501cdd08d37c61a27b832d0c349c32d9d0e
parente0953c8b85baaa38d77ebd5dc4051bc3837c1191
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c