Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
commitd6d61c97e69ca0e8471804603cf00d8abf2fa12d
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Apr 2011 18:31:21 +0000 (22 11:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Apr 2011 18:31:21 +0000 (22 11:31 -0700)
tree4f930bc002243d323df9ad51cfe2cc40184d7a76
parent91e8549bde9e5cc88c5a2e8c8114389279e240b5
parent2ea4db65be3c4027ed39da73e1b6a59c8aa6c7c9
Merge branch 'irq-fixes-for-linus' of git://git./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:
  xtensa: Fixup irq conversion fallout and nmi_count