Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Nov 2018 19:40:22 +0000 (13:40 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Nov 2018 19:40:22 +0000 (13:40 -0600)
commite2f8b472a70827348ce2007e121d67f49047ba62
tree8feae62a175cc3d26cf89262c0b82590c53eda1f
parentccda4af0f4b92f7b4c308d3acc262f4a7e3affad
parent5df7a99bdd0de4a0480320264c44c04543c29d5a
Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fix from Russell King:
 "It was noticed that one of Julien's patches contained an error, this
  fixes that up"

* 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc
arch/arm/vfp/vfpmodule.c