From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Nov 2014 23:45:07 +0000 (-0800)
Subject: Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
X-Git-Tag: firefly_0821_release~176^2~2858
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f01feb8b97a4d65caa1456cb12f0f770497347f;p=firefly-linux-kernel-4.4.55.git

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

Pull ARM fixes from Russell King:
 "Two fixes this time, one to ensure that the kuser helper option
  depends on MMU as they aren't available for noMMU targets (and if the
  option is selected, we end up oopsing.)

  The second fix plugs a corner case with the decompressor, ensuring
  that the instruction stream can see the relocated code in every case
  on ARMv7 CPUs"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8198/1: make kuser helpers depend on MMU
  ARM: 8191/1: decompressor: ensure I-side picks up relocated code
---

5f01feb8b97a4d65caa1456cb12f0f770497347f