Add Ondemand governor as a choice.
Revert "msm: bam_dmux: fix compilation issue"

This reverts commit f6c546a9cc09a58ab9ffa988c37d7d8e4b5f21b2.
Revert "msm: bam_dmux: optimize UL inactivity timeout"

This reverts commit c28a1b666662025060297665f5fae4892bba6182.
Revert "Delay UL powerdown if BAM is in polling mode"

This reverts commit e6c72d47695e45aacbc56c0c9700654a623e9d80.
Revert "msm: bam_dmux: UL inactivity timeout is too high"

This reverts commit a8d152c93076fce221506bf4e8690e574edad6e2.
cpufreq: ondemand: fix a derp on my input_boost code hook.

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
Merge branch 'nightlies' of github.com:franciscofranco/hammerhead into nightlies