Merge commit 'v2.6.36' into kbuild/misc