Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Nov 2018 16:10:01 +0000 (08:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Nov 2018 16:10:01 +0000 (08:10 -0800)
commit4581aa96475b792de4b1206a12830339b65ec246
tree0e81a170a30ce89aa1d9d2993ea313c199617372
parenta13511dfa836c8305a737436eed3ba9a8e74a826
parent6282e916f774e37845c65d1eae9f8c649004f033
Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fix from Russell King:
 "Ard spotted a typo in one of the assembly files which leads to a
  kernel oops when that code path is executed. Fix this"

* 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8809/1: proc-v7: fix Thumb annotation of cpu_v7_hvc_switch_mm
arch/arm/mm/proc-v7.S