Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Dec 2017 15:51:08 +0000 (10:51 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Dec 2017 15:51:08 +0000 (10:51 -0500)
commit87fc5c686ef3db9e58d2fd65e1bcc368ee6b1b76
tree60356b82b5cb986a85bd4fde31805e4b96787bd5
parentae4806a38bc8db0b48e746445c41afd249568d68
parent3aaf33bebda8d4ffcc0fc8ef39e6c1ac68823b11
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fix from Russell King:
 "Just one fix this time around, for the late commit in the merge window
  that triggered a problem with qemu. Qemu is apparently also going to
  receive a fix for the discovered issue"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: avoid faulting on qemu
arch/arm/kernel/entry-header.S