diff options
| author | Mark Brown <broonie@kernel.org> | 2018-11-19 13:16:15 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-11-19 13:16:15 +0000 |
| commit | ffb8c1e45e7ae648a3a1689aa71be50fb459316e (patch) | |
| tree | 9861dadf0dc742e519e28eabdeee448a57c86170 /net/lapb/lapb_timer.c | |
| parent | a8d8ee437ea0bf21f840f33ca87f8e1641727aae (diff) | |
| parent | ff9b34b615a37a3f4d359bf82fc97f5e0310b301 (diff) | |
Merge branch 'topic/coupled' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-4.21 for trivial conflict
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions