Merge commit 'v2.6.31-rc6' into core/rcu