Merge branch 'x86/urgent' into core/percpu

Conflicts:
	arch/x86/kernel/acpi/boot.c
This commit is contained in:
Ingo Molnar
2009-02-10 00:41:02 +01:00
24 changed files with 198 additions and 115 deletions

View File

@@ -353,7 +353,7 @@ struct i387_soft_struct {
u8 no_update;
u8 rm;
u8 alimit;
struct info *info;
struct math_emu_info *info;
u32 entry_eip;
};