]> 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: f43966c e0953c8)
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 02:03:10 +0000 (13:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 02:03:10 +0000 (13:03 +1100)
Conflicts:
drivers/net/tun.c


Trivial merge
Linux kernel for KaRo TX COM modules