Update arch/x86/kernel/setup.c

Squashed update of kernel from 3.0.61 to 3.0.62