Merge commit 'v2.6.29-rc8' into cpus4096