Merge back staging AVS changes for v4.21.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 11 Dec 2018 11:02:46 +0000 (12:02 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 11 Dec 2018 11:02:46 +0000 (12:02 +0100)

Trivial merge