Merge commit 'v2.6.35' into kbuild/kbuild