diff options
| author | Ingo Molnar <[email protected]> | 2020-07-31 12:12:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2020-07-31 12:13:21 +0200 |
| commit | adb334d17858d8b679a41f7f2cd230e5c6accc0a (patch) | |
| tree | fd4fd188aedd4412b6d1097eb58e0a479bb97596 /fs/ubifs/commit.c | |
| parent | f3020b8891b890b48d9e1a83241e3cce518427c1 (diff) | |
| parent | f87032aec41e0b00ae5fa9103eb8e7b2d1f8416b (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 <[email protected]>
Diffstat (limited to 'fs/ubifs/commit.c')
0 files changed, 0 insertions, 0 deletions