diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2023-01-11 21:15:41 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2023-01-11 21:15:41 -0300 |
| commit | e120342f45674fe68a42f95c4ba563dd83dd4f38 (patch) | |
| tree | c7d2c2a90d24121af29aed99ad47d639b20402b8 /drivers/mtd/spi-nor/macronix.c | |
| parent | 77f469806a061dc9a144a204a08f0d278c486344 (diff) | |
| parent | 90ffbb727c511c6de9c5905c8d5aba69e413bcba (diff) | |
Merge tag 'v5.15.86' into 5.15-2.2.x-imx
This is the 5.15.86 stable release
Conflicts:
arch/arm64/kernel/traps.c
drivers/gpu/drm/bridge/adv7511/adv7511.h
drivers/gpu/drm/bridge/adv7511/adv7533.c
drivers/gpu/drm/rockchip/cdn-dp-core.c
drivers/net/ethernet/freescale/enetc/enetc.c
drivers/usb/dwc3/core.c
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'drivers/mtd/spi-nor/macronix.c')
0 files changed, 0 insertions, 0 deletions