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)
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

1  2 
arch/arm/kernel/entry-header.S

Simple merge