From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Sep 2013 20:58:35 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
X-Git-Tag: accepted/tizen/common/20141203.182822~1464
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e6a1fb1167b8d230c6edcebd31e173cd0add1e5;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM fixes from Russell King:
 "Just two fixes here - one for the recent addition of Neon stuff which
  causes problems when this is built as a module.  The other was one
  spotted by Olof with the fixed-HZ stuff.

  Last patch (which is at the very top) is not a fix per-se, but an
  almost-end-of-merge window sorting of the select symbols in
  arch/arm/Kconfig to keep them as akpm would like to reduce unnecessary
  conflicts.  I've also taken the liberty this time to add a comment at
  the end to discourage the endless "add the next select to the bottom
  of a nicely sorted list" syndrome"

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: sort arch/arm/Kconfig
  ARM: fix forced-HZ values
  ARM: 7835/2: fix modular build of xor_blocks() with NEON enabled
---

0e6a1fb1167b8d230c6edcebd31e173cd0add1e5