diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-11-05 17:47:49 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-11-05 17:47:49 +0000 |
| commit | 32fa65b1d7d22ef7a185a3c89283c89aa532d83b (patch) | |
| tree | 006294312059c1967b26fc03901eded1232b08bb /drivers/crypto/chelsio | |
| parent | 70d1232fdbe28e4c765c4cfc3cc5c7580959d5e0 (diff) | |
| parent | 6e97ed6efa701db070da0054b055c085895aba86 (diff) | |
Merge tag 'v5.4.75' into 5.4-2.1.x-imx
This is the 5.4.75 stable release
Conflicts:
- drivers/i2c/busses/i2c-imx.c:
Drop NXP changes, which are covered by commit [2c58d5e0c754c] from
upstream.
- drivers/net/can/flexcan.c:
Keep NXP implementation, patch [ca10989632d88] from upstream is covered
in the NXP tree.
- drivers/usb/host/xhci.h:
Fix merge fuzz for upstream commit [2600a131e1f61]
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'drivers/crypto/chelsio')
0 files changed, 0 insertions, 0 deletions