Merged features from upstream Linux 3.9-rc6