commit | 4581aa96475b792de4b1206a12830339b65ec246 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 06 08:10:01 2018 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 06 08:10:01 2018 -0800 |
tree | 0e81a170a30ce89aa1d9d2993ea313c199617372 | |
parent | a13511dfa836c8305a737436eed3ba9a8e74a826 [diff] | |
parent | 6282e916f774e37845c65d1eae9f8c649004f033 [diff] |
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