]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a13511d 6282e91)
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)
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

1  2 
arch/arm/mm/proc-v7.S patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mm/proc-v7.S
Simple merge
Unnamed repository; edit this file 'description' to name the repository.