Merge branch 'x86/cpu'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Jun 2016 21:49:23 +0000 (23:49 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Jun 2016 21:49:23 +0000 (23:49 +0200)

Trivial merge