diff options
| author | Lee Jones <lee.jones@linaro.org> | 2015-06-22 12:24:25 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2015-06-22 12:24:25 +0100 |
| commit | 79aa79342c70c47a6e55f4865e8154f155109946 (patch) | |
| tree | 7dc36abea21ce7fa5755184c12be274d6efdb382 /net/lapb/lapb_timer.c | |
| parent | db4112e6d71526def391d4cdd708b3a826643228 (diff) | |
| parent | 6d4fa89dcd85e2427da83319ce75e5df5febcc96 (diff) | |
| parent | cf649e00769a401d317352c4fe405169ddf61e1f (diff) | |
Merge branches 'ib-mfd-watchdog-rtc-4.2', 'ib-mfd-regulator-4.2' and 'ib-mfd-i2c-input-chrome-4.2' into ibs-for-mfd-merged