]> 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: 1273794 1ee245b)
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 01:50:18 +0000 (11:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 01:50:18 +0000 (11:50 +1000)
Conflicts:
arch/powerpc/kvm/booke_interrupts.S


Trivial merge
Linux kernel for KaRo TX COM modules