Comment 16 for bug 1320782

Unfortunately due to the strong demand from users to get features in we're pretty much being forced to track -next rather than Linus' tree (as well as things like Lorenzo's cpuidle PSCI integration that haven't made it in).

I will have got around to picking up the revert if it's done as a revert (which it is) anyway as part of my regular catchups, I'll go pull this one a little sooner and see if that helps.