From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Sep 2013 14:31:38 +0000 (-0700)
Subject: Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v3.12-rc1~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=399a946edbbe90bd03aec2e93ce58c9b3f18e70b;p=~emulex%2Finfiniband.git

Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull generic hardirq option removal from Martin Schwidefsky:
 "All architectures now use generic hardirqs, s390 has been last to
  switch.

  With that the code under !CONFIG_GENERIC_HARDIRQS and the related
  HAVE_GENERIC_HARDIRQS and GENERIC_HARDIRQS config options can be
  removed.  Yay!"

* 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  Remove GENERIC_HARDIRQ config option
---

399a946edbbe90bd03aec2e93ce58c9b3f18e70b