More 2.6.32 block/fs/mm merging (non-compiling)