Merge commit 'v2.6.29.1' into m68k-v2.6.29