diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-05-15 21:20:33 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-05-15 21:20:51 +0300 |
| commit | 32a0e127b4e0273fc9dd50fc895f652da8e01b7a (patch) | |
| tree | ef1900f18f140e7953f10ebc2cc12335a2fef64a /drivers/rtc/rtc-ds1374.c | |
| parent | 3b3ec606fa0ecd42b179663dcdc4985801ab1d81 (diff) | |
| parent | 5d60efc89fa6e5a6616bd9dfa2b0702756b7404e (diff) | |
Merge remote-tracking branch 'msm8998/lineage-17.1' into lineage-17.1
Conflicts:
drivers/video/fbdev/msm/mdss_dsi.c
Change-Id: Iba3ecdb90a4d713bb92566b1f096e35e47294240
Diffstat (limited to 'drivers/rtc/rtc-ds1374.c')
0 files changed, 0 insertions, 0 deletions