Merge branch 'pm-avs'
commit4734c6efc8c691fda80f11ae00016bc3a8d9ebb5
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Oct 2014 23:18:38 +0000 (7 01:18 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Oct 2014 23:18:38 +0000 (7 01:18 +0200)
treeff27c54c0d9787e3321a8591005b356ea2305ecc
parent0f4685d0ec9aa1db99f014f8f774518cae085aca
parent7961bb722631cbf0cd68c57f3255ba66e1a879d9
Merge branch 'pm-avs'

* pm-avs:
  MAINTAINERS: update entry for drivers/power/avs
  PM / AVS: rockchip-io: add driver handling Rockchip io domains
  regulator: core: Add REGULATOR_EVENT_PRE_VOLTAGE_CHANGE (and ABORT)
MAINTAINERS