Merge cpu/power kernel routines to 2.6.32 and partial revert for init/main.c