]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit8d5a5404af78eb83c80119837faac9fc52967c1b
tree864cb7043c69691a9e5f15010cf81c846db30569
parentb22ba1460c8692107ca2503dcd8be835c9bb0358
parent1c92ce8487f6642621d52fadc499c9a76e4878f0
Merge remote-tracking branch 'parisc-hd/for-next'

Conflicts:
arch/parisc/include/asm/processor.h
arch/parisc/kernel/irq.c