Merge OPP material for v4.11 to satisfy dependencies.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 9 Feb 2017 21:52:35 +0000 (22:52 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 9 Feb 2017 21:52:35 +0000 (22:52 +0100)

Trivial merge