From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Jun 2017 15:56:52 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3c2bfbaadff6e0c257bb6b16c9c97f43618b13dc;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Pull ARM fixes from Russell King:
 "Three more fixes:

   - Fix the previous fix merged in the last pull for the Thumb2
     decompressor.

   - A fix from Vladimir to correctly identify the V7M cache type.

   - The optimised 3G vmsplit case does not work with LPAE, so don't
     allow this to be selected for LPAE configurations"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8682/1: V7M: Set cacheid iff DminLine or IminLine is nonzero
  ARM: 8681/1: make VMSPLIT_3G_OPT depends on !ARM_LPAE
  ARM: 8680/1: boot/compressed: fix inappropriate Thumb2 mnemonic for __nop
---

3c2bfbaadff6e0c257bb6b16c9c97f43618b13dc