From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Apr 2014 19:55:04 +0000 (-0700)
Subject: Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
X-Git-Tag: v3.15-rc3~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2b9d1c050d291693f257c98605028325f8146c84;p=~emulex%2Finfiniband.git

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

Pull arm fixes from Russell King:
 "A number of fixes for the PJ4/iwmmxt changes which arm-soc forced me
  to take during the merge window.  This stuff should have been better
  tested and sorted out *before* the merge window"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8042/1: iwmmxt: allow to build iWMMXt on Marvell PJ4B
  ARM: 8041/1: pj4: fix cpu_is_pj4 check
  ARM: 8040/1: pj4: properly detect existence of iWMMXt coprocessor
  ARM: 8039/1: pj4: enable iWMMXt only if CONFIG_IWMMXT is set
  ARM: 8038/1: iwmmxt: explicitly check for supported architectures
---

2b9d1c050d291693f257c98605028325f8146c84