Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree