| commit | 0871d5a66da5c41151e0896a90298b163e42f2e0 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Mar 01 09:02:26 2017 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Mar 01 09:02:26 2017 +0100 |
| tree | 1ba71fab9016cb28bb9d18ffd62b6b744f2f761c | |
| parent | e22af0be2cf654bb225f19750c6b9aab1627dc9e [diff] | |
| parent | 2d6be4abf514fc26c83d239c7f31da1f95e4a31d [diff] |
Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates Conflicts: arch/x86/xen/setup.c Signed-off-by: Ingo Molnar <mingo@kernel.org>