Merge branch 'linus' into x86/x2apic (8067794b) · Commits · hpc / Old_Soft / kernel

Commit 8067794b authored Aug 11, 2008 by

Ingo Molnar



Conflicts:

	arch/x86/kernel/genapic_64.c

Manual merge:

	arch/x86/kernel/genx2apic_uv_x.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment