Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D

Browse Source

Conflicts:
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/signal_64.c
	include/asm-x86/cpufeature.h

...

This commit is contained in:

Ingo Molnar

2008-10-11 20:23:20 +02:00

parent d84705969f 43603c8df9

commit 0afe2db213

68 changed files with 3079 additions and 2377 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1059

arch/x86/kernel/cpu/common.c

File diff suppressed because it is too large Load Diff