Staging: merge staging patches into Linus's main branch