Merge branch 'staging-next' into Linux 3.1