diff options
| author | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 07:17:14 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 07:17:14 +0000 |
| commit | 188eac302f18174c537f3142e103f75bcf9d8a6d (patch) | |
| tree | 3f072b326bc081dac683b452ffa1e2848e394ea1 /Documentation/devicetree/bindings/usb/typec-switch-gpio.txt | |
| parent | 1e10771673463a332a7e477fcba0b9488ec5362b (diff) | |
| parent | 67cb016870e2fa9ffc8d34cf20db5331e6f2cf4d (diff) | |
Merge tag 'v5.4.48' into 5.4-2.1.x-imx
This is the 5.4.48 stable release
Conflicts (manual resolve, upstream taken):
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
Commit d1a00c9bb1 from upstream solves the issue with improper error
reporting when qdisc type support is absent. Upstream version is merged
into NXP implementation.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'Documentation/devicetree/bindings/usb/typec-switch-gpio.txt')
0 files changed, 0 insertions, 0 deletions