Rafael J. Wysocki 622ade3a2f Merge branch 'pm-cpuidle' ... * pm-cpuidle: intel_idle: Graceful probe failure when MWAIT is disabled cpuidle: Avoid assignment in if () argument cpuidle: Clean up cpuidle_enable_device() error handling a bit cpuidle: ladder: Add per CPU PM QoS resume latency support ARM: cpuidle: Refactor rollback operations if init fails ARM: cpuidle: Correct driver unregistration if init fails intel_idle: replace conditionals with static_cpu_has(X86_FEATURE_ARAT) cpuidle: fix broadcast control when broadcast can not be entered Conflicts: drivers/idle/intel_idle.c		2017-11-13 01:34:14 +01:00
..
intel_idle.c	Merge branch 'pm-cpuidle'	2017-11-13 01:34:14 +01:00
Kconfig	i7300_idle: Remove this driver	2016-11-18 12:07:56 +01:00
Makefile	i7300_idle: Remove this driver	2016-11-18 12:07:56 +01:00