Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Mar 2011 20:06:32 +0000 (13:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Mar 2011 20:06:32 +0000 (13:06 -0700)
* '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


Trivial merge