Merge commit 'v2.6.31-rc7' into irq/core