Staging: Merge branch 'staging-next' into 2.6.38-rc3