From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 13 Jul 2014 19:09:18 +0000 (-0700)
Subject: Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
X-Git-Tag: v3.16-rc5~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5fa77b54eff1e4fb38494b5a24c66768d6e7c148;p=~emulex%2Finfiniband.git

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "Another round of fixes for ARM:
   - a set of kprobes fixes from Jon Medhurst
   - fix the revision checking for the L2 cache which wasn't noticed to
     have been broken"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: l2c: fix revision checking
  ARM: kprobes: Fix test code compilation errors for ARMv4 targets
  ARM: kprobes: Disallow instructions with PC and register specified shift
  ARM: kprobes: Prevent known test failures stopping other tests running
---

5fa77b54eff1e4fb38494b5a24c66768d6e7c148