Merge branches 'ib-mfd-base-acpi-dma-4.3', 'ib-mfd-clocksource-rtc-watchdog-4.3'...
authorLee Jones <lee.jones@linaro.org>
Tue, 11 Aug 2015 14:08:04 +0000 (15:08 +0100)
committerLee Jones <lee.jones@linaro.org>
Tue, 11 Aug 2015 14:08:04 +0000 (15:08 +0100)

Trivial merge