Merge commit 'v2.6.32.6' into mini2440-stable-v2.6.32