tree f580f0f531702b14d22e9f3a5d00fdbfee59dd51
parent 445aef374594207b278477dfd98fc5d1498d353a
parent 324808c2bc190e9424200e73faab1045df9b7d2e
author Linus Torvalds <torvalds@linux-foundation.org> 1301342792 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1301342792 -0700

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