From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Aug 2013 23:18:59 +0000 (-0700)
Subject: Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v3.11~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d9eda0fae1394ea1e1c59c94d4a120ad9c06e64a;p=~emulex%2Finfiniband.git

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "Two straggling fixes that I had missed as they were posted a couple of
  weeks ago, causing problems with interrupts (breaking them completely)
  on the CSR SiRF platforms"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm: prima2: drop nr_irqs in mach as we moved to linear irqdomain
  irqchip: sirf: move from legacy mode to linear irqdomain
---

d9eda0fae1394ea1e1c59c94d4a120ad9c06e64a