diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-06-22 09:15:03 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-06-22 09:15:03 +0200 |
commit | 7ef3d7d58d9dc73ee3d4f8f56d0024c8cca8163f (patch) | |
tree | 2e81eab742ade60de5bafde16bb4181f7af63ac3 /arch/m68k/include | |
parent | x86/hpet: Use proper hpet device number for MSI allocation (diff) | |
parent | x86/asm/entry/64: Disentangle error_entry/exit gsbase/ebx/usermode code (diff) | |
parent | x86/mm/pat, drivers/infiniband/ipath: Use arch_phys_wc_add() and require PAT ... (diff) | |
parent | x86/platform/intel/baytrail: Add comments about why we disabled HPET on Baytrail (diff) | |
download | linux-7ef3d7d58d9dc73ee3d4f8f56d0024c8cca8163f.tar.xz linux-7ef3d7d58d9dc73ee3d4f8f56d0024c8cca8163f.zip |
Merge branches 'x86/apic', 'x86/asm', 'x86/mm' and 'x86/platform' into x86/core, to merge last updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>