summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 18:44:05 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 18:44:05 +0100
commit508996b6a0ef0c7aa7701995d137e71c56180752 (patch)
tree913f72c00f8456a75926755d52a813d727db1408
parentMerge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentgenirq: Fix incorrect unlock in __setup_irq() (diff)
parentsched, kernel-doc: Fix runqueue_is_locked() description (diff)
downloadlinux-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