]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 965b560 8050936)
Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 20 May 2014 00:21:48 +0000 (10:21 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 20 May 2014 00:21:48 +0000 (10:21 +1000)
Merge "merge" branch to get two fairly important bug fixes:

powerpc/powernv: Reset root port in firmware
powerpc: irq work racing with timer interrupt can result in timer interrupt


Trivial merge
Linux kernel for KaRo TX COM modules