diff options
| author | Lee Jones <lee.jones@linaro.org> | 2017-09-05 09:45:36 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2017-09-05 09:45:36 +0200 |
| commit | 3f979bf8f56a22b2395edceed0dc371a538e34cc (patch) | |
| tree | fee956543202e102bcbb1155ec7aa88809738648 /arch/arm/mach-omap1/board-osk.c | |
| parent | ARM: ux500: Add vendor prefix to tps61052 node (diff) | |
| parent | mfd: tps65010: Move header file out of I2C realm (diff) | |
| parent | hwmon: da9052: Add support for TSI channel (diff) | |
| parent | iio: adc: stm32: add support for lptimer triggers (diff) | |
| parent | mfd: dm355evm_msp: Move header file out of I2C realm (diff) | |
| parent | mfd: twl: Move header file out of I2C realm (diff) | |
| parent | mfd: rk808: Add RK805 power key support (diff) | |
| download | linux-3f979bf8f56a22b2395edceed0dc371a538e34cc.tar.xz linux-3f979bf8f56a22b2395edceed0dc371a538e34cc.zip | |
Merge branches 'ib-mfd-arm-i2c-4.14', 'ib-mfd-arm-usb-video-4.14', 'ib-mfd-hwmon-4.14', 'ib-mfd-iio-pwm-4.14', 'ib-mfd-input-rtc-4.14', 'ib-mfd-many-4.14' and 'ib-mfd-pinctrl-regulator-4.14' into ibs-for-mfd-merged