]> 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: b22ba14 1c92ce8)
Merge remote-tracking branch 'parisc-hd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 00:51:18 +0000 (10:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 00:51:18 +0000 (10:51 +1000)
Conflicts:
arch/parisc/include/asm/processor.h
arch/parisc/kernel/irq.c


Trivial merge
Linux kernel for KaRo TX COM modules