projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f3020b8 f87032a)
Merge branch 'WIP.x86/entry' into x86/entry, to merge the latest generic code and...
authorIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2020 10:12:21 +0000 (12:12 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2020 10:13:21 +0000 (12:13 +0200)
commitadb334d17858d8b679a41f7f2cd230e5c6accc0a
treefd4fd188aedd4412b6d1097eb58e0a479bb97596tree | snapshot
parentf3020b8891b890b48d9e1a83241e3cce518427c1commit | diff
parentf87032aec41e0b00ae5fa9103eb8e7b2d1f8416bcommit | diff
Merge branch 'WIP.x86/entry' into x86/entry, to merge the latest generic code and resolve conflicts

Pick up and resolve the NMI entry code changes from the locking tree,
and also pick up the latest two fixes from tip:core/entry.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
ep93xx device tree rework repo: git://git.maquefel.me/linux.git