]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Jun 2017 18:19:40 +0000 (11:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Jun 2017 18:19:40 +0000 (11:19 -0700)
commit112eb07287d10bef6ec74e36f1ffd24f19bdd0a0
treee63ffa5c2a851b849dbcbd144226ad5fd10e949f
parent3c2993b8c6143d8a5793746a54eba8f86f95240f
parent06a4b6d009a1b74a6ec46c5418b46cc53a79fcb8
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "Three fixes this time around:

   - Two fixes for noMMU, fixing the decompressor header layout, and
     preventing a build error with some configurations.

   - Fixing the hyp-stub updates that went in during the merge window
     for platforms that use MCPM"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8677/1: boot/compressed: fix decompressor header layout for v7-M
  ARM: 8676/1: NOMMU: provide pgprot_device() macro
  ARM: 8675/1: MCPM: ensure not to enter __hyp_soft_restart from loopback and cpu_power_down