]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb9b07d 970379f)
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Jun 2014 03:28:53 +0000 (13:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Jun 2014 03:28:53 +0000 (13:28 +1000)
Conflicts:
drivers/vhost/net.c


Trivial merge
Linux kernel for KaRo TX COM modules