diff options
| author | Linus Torvalds | 2015-04-13 13:15:09 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2015-04-13 13:15:09 -0700 |
| commit | 977e1ba50893c15121557b39de586901fe3f75cf (patch) | |
| tree | c7b8d250f1e4741820d49ff3bff5329ad683ae6b /arch/x86/include/asm/alternative-asm.h | |
| parent | 7fd56474db326f7a6df0e2a4e3a9600cc083ab9b (diff) | |
| parent | 1912c7afa39d2683a574011ff455fe49ada8016c (diff) | |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 apic changes from Ingo Molnar:
"Changes:
- SGI UV APIC driver updates
- dead code removal"
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/apic/uv: Update the UV APIC HUB check
x86/apic/uv: Update the UV APIC driver check
x86/apic/uv: Update the APIC UV OEM check
x86/apic: Remove verify_local_APIC()
Diffstat (limited to 'arch/x86/include/asm/alternative-asm.h')
0 files changed, 0 insertions, 0 deletions