Merge "lpm-levels: Select lpm for isolated cpu when sleep is disabled"

author Linux Build Service Account <lnxbuild@localhost>

Fri, 21 Apr 2017 16:41:39 +0000 (09:41 -0700)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Fri, 21 Apr 2017 16:41:38 +0000 (09:41 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Fri, 21 Apr 2017 16:41:39 +0000 (09:41 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Fri, 21 Apr 2017 16:41:38 +0000 (09:41 -0700)
diff --cc drivers/cpuidle/lpm-levels.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Fri, 21 Apr 2017 16:41:39 +0000 (09:41 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Fri, 21 Apr 2017 16:41:38 +0000 (09:41 -0700)