Merge branch 'ib-mfd-iio-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 25 Nov 2014 01:18:58 +0000 (02:18 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 25 Nov 2014 01:18:58 +0000 (02:18 +0100)
commita26033a1f56b7b1f8a56050c0a9095694aecae11
tree8bb03cc2c30770f1e795ea9f7ebeceb6a6ba3fff
parent5d01410fe4d92081f349b013a2e7a95429e4f2c9
parent8019f6962708985782b65bd97be88046a55e1e4d
Merge branch 'ib-mfd-iio-3.19' of git://git./linux/kernel/git/lee/mfd into acpi-pmic

Pull MFD changes that the ACPI PMIC changes depend on from Lee Jones.
drivers/iio/adc/Kconfig
drivers/iio/adc/Makefile
drivers/mfd/Kconfig
drivers/mfd/axp20x.c