Merge branch 'cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 11 Apr 2015 00:28:00 +0000 (02:28 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 11 Apr 2015 00:28:00 +0000 (02:28 +0200)
commitbaa9a93a4412330a49245e69c5e8b22086656482
tree31e71829d280592d907be8110c05449758ba772c
parentd5cdc3c4c22fce5a187b51736f3d0dc3e6cbe282
parentcab07a5652d1d124b505c2b7ed21c6823295c5d7
Merge branch 'cpuidle' of git://git./linux/kernel/git/lenb/linux into pm-cpuidle

Pull intel_idle material for v4.1 from Len Brown.

* 'cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  intel_idle: Add support for the Airmont Core in the Cherrytrail and Braswell SOCs
  intel_idle: Update support for Silvermont Core in Baytrail SOC
drivers/idle/intel_idle.c