From: Linus Torvalds Date: Mon, 28 Mar 2011 20:06:32 +0000 (-0700) Subject: Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b34e138e8bcbdfd8da0c4b063a689d54e9ba9f16;p=linux-beck.git Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score * 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score: score: Use generic show_interrupts() score: Convert to new irq function names score: lost a semicolon in asm/irqflags.h score: Select GENERIC_HARDIRQS_NO_DEPRECATED score: Convert irq_chip to new functions --- b34e138e8bcbdfd8da0c4b063a689d54e9ba9f16