From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Oct 2013 10:49:23 +0000 (+0100)
Subject: Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v3.12-rc7~10
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4208c471995f90479cd129b15cd459b4a7eaebb3;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:
 "There's really only one bugfix in this branch, which is a fix for
  timers on the integrator platform.  Since Linus Walleij is
  resurrecting support for the platform it seems valuable to get the fix
  into 3.12 even though the regression has been around a while.

  The rest are a handful of maintainers updates.  If you prefer to hold
  those until 3.13 then just merge the first patch on the branch which
  is the fix"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  MAINTAINERS: Add maintainers entry for Rockchip SoCs
  MAINTAINERS: Tegra updates, and driver ownership
  MAINTAINERS: ARM: mvebu: add Sebastian Hesselbarth
  ARM: integrator: deactivate timer0 on the Integrator/CP
---

4208c471995f90479cd129b15cd459b4a7eaebb3