tree 60356b82b5cb986a85bd4fde31805e4b96787bd5
parent ae4806a38bc8db0b48e746445c41afd249568d68
parent 3aaf33bebda8d4ffcc0fc8ef39e6c1ac68823b11
author Linus Torvalds <torvalds@linux-foundation.org> 1512316268 -0500
committer Linus Torvalds <torvalds@linux-foundation.org> 1512316268 -0500

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