OSDN Git Service

(root) / tomoyo / tomoyo-test1.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b3d9a13 af8e947)
Merge branch 'x86/build' into x86/asm, to fix up conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 7 Nov 2017 09:54:30 +0000 (10:54 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 7 Nov 2017 09:54:30 +0000 (10:54 +0100)
commit67caadc611eb1bf4aefc7c7a33dde30d12832569
treed36388a7af0948af048542d25a35ae36d1570379tree | snapshot
parentb3d9a136815ca9284ade2a897a3b7d2b0084c33ccommit | diff
parentaf8e947079a7dab0480b5d6db6b093fd04b86fc9commit | 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>
arch/x86/entry/syscalls/Makefile diff1 | diff2 | blob | history
This is a test repository.
About OSDN
Find Software
Develop Software
Help