Merge commit 'v2.6.31.7' into mini2440-stable-v2.6.31