Merge 2.6.32 init routines