Merge branch 'pm-clk' into acpi-lpss
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 25 May 2014 12:40:34 +0000 (14:40 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 25 May 2014 12:40:34 +0000 (14:40 +0200)

Trivial merge