]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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

1  2 
arch/arm/vfp/vfpmodule.c

Simple merge