leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'linus' into perfcounters/core

Browse Source 
Conflicts:
	arch/x86/kernel/acpi/boot.c
This commit is contained in:
Ingo Molnar
2009-02-13 09:34:07 +01:00
parent 4bcf349a0f 071a0bc2ce
commit e9c4ffb11f
194 changed files with 6697 additions and 2037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/processor.h
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;
};