projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 42390cd af2e1f2)
Merge branch 'x86/cpu' into x86/x2apic
authorH. Peter Anvin <hpa@zytor.com>
Thu, 4 Sep 2008 16:21:21 +0000 (09:21 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 4 Sep 2008 16:21:21 +0000 (09:21 -0700)
commitaa3341a168883654d1b13f5931c5ed2762537831
tree1394eb320916b4e5604761dbc8ae1a9bc1903602tree | snapshot (tar.gz zip)
parent42390cdec5f6e6e2ee54f308474a6ef7dd16aa5ccommit | diff
parentaf2e1f276ff08f17192411ea3b71c13a758dfe12commit | diff
Merge branch 'x86/cpu' into x86/x2apic

Conflicts:

arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
include/asm-x86/cpufeature.h diff1 | diff2 | blob | history