From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Mar 2011 02:40:35 +0000 (-0700)
Subject: Merge branch 'um-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.39-rc1~502
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0310e437182568a9e0aa862f2a9d13908069df73;p=~emulex%2Finfiniband.git

Merge branch 'um-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'um-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  um: Select GENERIC_HARDIRQS_NO_DEPRECATED
  um: Use proper accessors in show_interrupts()
  um: Convert irq_chips to new functions
  um: Remove stale irq_chip.end
---

0310e437182568a9e0aa862f2a9d13908069df73