Merge commit 'v2.6.30.10' into mini2440-stable-v2.6.30