From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Nov 2018 16:10:01 +0000 (-0800)
Subject: Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Tag: v4.20-rc2~32
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=4581aa96475b792de4b1206a12830339b65ec246

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

4581aa96475b792de4b1206a12830339b65ec246