diff options
| author | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 08:22:03 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 08:22:03 +0000 |
| commit | 7da1a123ebce2005573def510c61214fc1000163 (patch) | |
| tree | 5f3c8a2ab73547cc694813b7ce3c19d8d94bc0b2 /drivers/misc/atmel-ssc.c | |
| parent | 998274208bcb6fdbedeceea431848b6d0839ed36 (diff) | |
| parent | c57b1153a58a6263863667296b5f00933fc46a4f (diff) | |
Merge tag 'v5.4.52' into 5.4-2.1.x-imx
This is the 5.4.52 stable release
Conflicts (manual resolve, NXP version kept):
arch/arm/mach-imx/pm-imx6.c
NXP version has a different PM vectoring scheme, where the IRAM bottom
half (8k) is used to store IRAM code and pm_info. Keep this version to
be compatible with NXP PM implementation.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'drivers/misc/atmel-ssc.c')
0 files changed, 0 insertions, 0 deletions