Merge branch 'linus' into x86/pebs

Conflicts:

	arch/x86/Kconfig.cpu
	arch/x86/kernel/cpu/intel.c
	arch/x86/kernel/setup_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2008-07-25 11:37:07 +02:00
commit 0e2f65ee30
7552 changed files with 628349 additions and 548384 deletions

12
.gitignore vendored

Some files were not shown because too many files have changed in this diff Show more