merge Linus head tree into my drm tree and fix up conflicts
[safe/jmp/linux-2.6] / lib / smp_processor_id.c
2005-06-22 Ingo Molnar[PATCH] smp_processor_id() cleanup