Merge branch 'x86/urgent' into x86/cleanups
commit94d4ac2f4a58c6e37876827c6688c61cef21290c
authorH. Peter Anvin <hpa@zytor.com>
Tue, 26 Aug 2008 05:45:37 +0000 (25 22:45 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 26 Aug 2008 05:45:37 +0000 (25 22:45 -0700)
tree732f4e4794f3c116041242f69754637f75c0dd57
parented21763e7b0b3fb50e4efd9d4bc17ef5b035d304
parent08970fc4e0385790a7b093adfaa4165a189f9eb0
Merge branch 'x86/urgent' into x86/cleanups
arch/x86/kernel/cpuid.c
arch/x86/pci/irq.c