Skip to content
Commit 0a924200 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back earlier cpuidle material for 3.19-rc1. 

Conflicts:
	drivers/cpuidle/dt_idle_states.c
parents a74a5a33 b82b6cca
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment