Merge commit 'v2.6.29.6' into mini2440-stable-v2.6.29