Merge back earlier 'acpica' material for v3.18.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Sep 2014 13:31:43 +0000 (15:31 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Sep 2014 13:31:43 +0000 (15:31 +0200)

Trivial merge