summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 10:44:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 10:44:05 -0700
commit508996b6a0ef0c7aa7701995d137e71c56180752 (patch)
tree913f72c00f8456a75926755d52a813d727db1408 /arch/cris
parent619297855aa16646246ea4b1f6e05f1b2455c808 (diff)
parent1c389795c15d349c2c7b23baf927e16e86ca3ae8 (diff)
parent58cbe2476abce8b5e3508d23bd05c2e2e8c394da (diff)
Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Fix incorrect unlock in __setup_irq() cris: Use generic show_interrupts() genirq: show_interrupts: Check desc->name before printing it blindly cris: Use accessor functions to set IRQ_PER_CPU flag cris: Fix irq conversion fallout * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched, kernel-doc: Fix runqueue_is_locked() description