| commit | 67caadc611eb1bf4aefc7c7a33dde30d12832569 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Tue Nov 07 10:54:30 2017 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Tue Nov 07 10:54:30 2017 +0100 |
| tree | d36388a7af0948af048542d25a35ae36d1570379 | |
| parent | b3d9a136815ca9284ade2a897a3b7d2b0084c33c [diff] | |
| parent | af8e947079a7dab0480b5d6db6b093fd04b86fc9 [diff] |
Merge branch 'x86/build' into x86/asm, to fix up conflicts Conflicts: arch/x86/entry/syscalls/Makefile Signed-off-by: Ingo Molnar <mingo@kernel.org>