Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Sep 2013 14:31:38 +0000 (07:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Sep 2013 14:31:38 +0000 (07:31 -0700)
commit399a946edbbe90bd03aec2e93ce58c9b3f18e70b
treeb467f7225be817a6ee7cf7e3c64518825dfec4f1
parent183c420323a9e45af0d995d7cbf416221698cbe4
parent0244ad004a54e39308d495fee0a2e637f8b5c317
Merge branch 'genirq' of git://git./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