diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-13 14:26:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-13 14:26:46 +0100 |
| commit | e449f7a394dfa444d2e3c15be2cffb758c79a6c9 (patch) | |
| tree | d500861e74ebc8c8574d456ffc9e39a324d3d2e6 /net/lapb/lapb_timer.c | |
| parent | 1c21e63465d1cbe051256951236a694c0a32e39d (diff) | |
| parent | ddecd1492de476488a92493510fb86c6ffe9acbd (diff) | |
| parent | 3fafd14d9422c46f5c2a142298384dc15dbf88b2 (diff) | |
Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/dwc' into asoc-next