diff options
| author | Lee Jones | 2015-08-11 15:08:04 +0100 |
|---|---|---|
| committer | Lee Jones | 2015-08-11 15:08:04 +0100 |
| commit | d548ca43d0333a0c4af0c79e9e6aafc29cd5a854 (patch) | |
| tree | 46f4f59d7f0011b953a63ef65df3735f7aef2548 /drivers | |
| parent | 4b45efe8526359a11ca60a299bef3aebf413fd77 (diff) | |
| parent | 82805d1b3ee0d93d08fe8957f253642a6f778f9a (diff) | |
| parent | 2a7a0e9bf7b32e838d873226808ab8a6c00148f7 (diff) | |
Merge branches 'ib-mfd-base-acpi-dma-4.3', 'ib-mfd-clocksource-rtc-watchdog-4.3' and 'ib-mfd-i2c-x86-watchdog-4.3' into ibs-for-mfd-merged