Merge 2.6.32 main files & cleanup