Merge branch 'omap-for-v4.10/cpuidle-v2' into omap-for-v4.10/soc
authorTony Lindgren <tony@atomide.com>
Mon, 14 Nov 2016 23:58:18 +0000 (15:58 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 14 Nov 2016 23:58:18 +0000 (15:58 -0800)

Trivial merge