Merge branches 'ib-mfd-gpio-4.12', 'ib-mfd-iio-input-4.12', 'ib-mfd-input-4.12',...

author Lee Jones <lee.jones@linaro.org>

Thu, 27 Apr 2017 08:24:41 +0000 (09:24 +0100)

committer Lee Jones <lee.jones@linaro.org>

Thu, 27 Apr 2017 08:24:41 +0000 (09:24 +0100)
author Lee Jones <lee.jones@linaro.org>
Thu, 27 Apr 2017 08:24:41 +0000 (09:24 +0100)
committer Lee Jones <lee.jones@linaro.org>
Thu, 27 Apr 2017 08:24:41 +0000 (09:24 +0100)
diff --cc include/linux/mfd/motorola-cpcap.h
Simple merge
author	Lee Jones <lee.jones@linaro.org>
	Thu, 27 Apr 2017 08:24:41 +0000 (09:24 +0100)
committer	Lee Jones <lee.jones@linaro.org>
	Thu, 27 Apr 2017 08:24:41 +0000 (09:24 +0100)