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

69 changed files with 3280 additions and 2578 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

68

kernel/resource.c

View file