diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 18:44:05 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 18:44:05 +0100 |
| commit | 508996b6a0ef0c7aa7701995d137e71c56180752 (patch) | |
| tree | 913f72c00f8456a75926755d52a813d727db1408 /arch/cris/kernel | |
| parent | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | genirq: Fix incorrect unlock in __setup_irq() (diff) | |
| parent | sched, kernel-doc: Fix runqueue_is_locked() description (diff) | |
| download | linux-508996b6a0ef0c7aa7701995d137e71c56180752.tar.xz linux-508996b6a0ef0c7aa7701995d137e71c56180752.zip | |
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