Merge branch 'linus' into x86/pebs
Conflicts:
arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c
Signed-off-by:
Ingo Molnar <mingo@elte.hu>
Some changes are not shown.
For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.
Please register or sign in to comment