Merge branches 'ib-mfd-arm-i2c-4.14', 'ib-mfd-arm-usb-video-4.14', 'ib-mfd-hwmon...
authorLee Jones <lee.jones@linaro.org>
Tue, 5 Sep 2017 07:45:36 +0000 (08:45 +0100)
committerLee Jones <lee.jones@linaro.org>
Tue, 5 Sep 2017 07:45:36 +0000 (08:45 +0100)
1  2  3  4  5  6  7 
arch/arm/mach-omap1/board-osk.c
drivers/mfd/Kconfig

Simple merge
Simple merge