projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6dc1787 adeb553)
Merge branch 'x86/asm' into x86/apic, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Sun, 17 May 2015 05:58:08 +0000 (07:58 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 17 May 2015 05:58:08 +0000 (07:58 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge