From: Linus Torvalds Date: Fri, 22 Apr 2011 18:31:21 +0000 (-0700) Subject: Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d6d61c97e69ca0e8471804603cf00d8abf2fa12d;p=linux-beck.git Merge branch 'irq-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: xtensa: Fixup irq conversion fallout and nmi_count --- d6d61c97e69ca0e8471804603cf00d8abf2fa12d