| commit | 2f4670b1053fa658ef827153a7ab9c3f6e8cea41 | [log] [tgz] |
|---|---|---|
| author | Michael Bestas <mkbestas@lineageos.org> | Mon Apr 26 01:27:02 2021 +0300 |
| committer | Michael Bestas <mkbestas@lineageos.org> | Mon Apr 26 01:27:02 2021 +0300 |
| tree | fb411a5d8c2d7034df69372e7038782abe26aa6c | |
| parent | 63c8a0b9153e45d95f6ae9c12c0f0ab2fd23b163 [diff] | |
| parent | eb292dddd3afb72fd65ecf9bad60dbe087f28c55 [diff] |
Merge branch 'android-4.9-q' of https://android.googlesource.com/kernel/common into lineage-18.1-caf-sdm845 * 'android-4.9-q' of https://android.googlesource.com/kernel/common: (668 commits) Conflicts: drivers/md/dm-table.c drivers/mmc/core/mmc.c drivers/scsi/ufs/ufshcd.c drivers/usb/gadget/configfs.c kernel/exit.c mm/page-writeback.c Change-Id: Id92b0ecfb258ab1741bdb72f4885623a6c476aaa