kernel.git/arch/x86/include/asm/timer.h, branch linux-2.6.30.y

x86: fix mismerge in arch/x86/include/asm/timer.h

2009-03-30T17:10:49Z

Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds

x86: refactor x86_quirks support

2009-02-22T23:08:11Z

Impact: cleanup Make x86_quirks support more transparent. The highlevel methods are now named: extern void x86_quirk_pre_intr_init(void); extern void x86_quirk_intr_init(void); extern void x86_quirk_trap_init(void); extern void x86_quirk_pre_time_init(void); extern void x86_quirk_time_init(void); This makes it clear that if some platform extension has to do something here that it is considered ... weird, and is discouraged. Also remove arch_hooks.h and move it into setup.h (and other header files where appropriate). Signed-off-by: Ingo Molnar

x86: Fix ASM_X86__ header guards

2008-10-23T05:55:23Z

Change header guards named "ASM_X86__*" to "_ASM_X86_*" since: a. the double underscore is ugly and pointless. b. no leading underscore violates namespace constraints. Signed-off-by: H. Peter Anvin

x86, um: ... and asm-x86 move

2008-10-23T05:55:20Z

Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin