]> 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: ffcb09f e34af78)
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...
authorRadim Krčmář <rkrcmar@redhat.com>
Tue, 6 Dec 2016 13:49:05 +0000 (14:49 +0100)
committerRadim Krčmář <rkrcmar@redhat.com>
Tue, 6 Dec 2016 13:49:05 +0000 (14:49 +0100)
Eliminate merge conflict between 9e5f68842276 and ebe4535fbe7a.


Trivial merge
Linux kernel for KaRo TX COM modules