Merge branches 'pm-sleep' and 'pm-qos' into bleeding-edge * pm-sleep: PM: dpm_watchdog: Add sysctl interface for DPM watchdog timeouts * pm-qos: PM: QoS: Fix misc device registration unwind