tree 31e71829d280592d907be8110c05449758ba772c
parent d5cdc3c4c22fce5a187b51736f3d0dc3e6cbe282
parent cab07a5652d1d124b505c2b7ed21c6823295c5d7
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1428712080 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1428712080 +0200

Merge branch 'cpuidle' of git://git.kernel.org/pub/scm/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