tree 913f72c00f8456a75926755d52a813d727db1408
parent 619297855aa16646246ea4b1f6e05f1b2455c808
parent 1c389795c15d349c2c7b23baf927e16e86ca3ae8
parent 58cbe2476abce8b5e3508d23bd05c2e2e8c394da
author Linus Torvalds <torvalds@linux-foundation.org> 1300470245 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300470245 -0700

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