Minor fixes, hacks and backports for 2.6.32 block/fs/mm merge (compile stage)