1
0
Fork 0
alistair23-linux/Documentation/media
Andrey Zhizhikin 4068d70849 This is the 5.4.75 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl+j2NoACgkQONu9yGCS
 aT5J8RAAnGBQDsYW32cIwCnEMAAzderx88BD1LWUh3VUzYkUkR/BZVzfR9oBCNNo
 3JnCXiJGAmxQqNmM4U4oll1qtDKSnkEL0d3x0dzoPU0jAK2DneZZeUceGXrCsACD
 07UmEJ+pg8YwHIDWjPl/XzsOFNDZGIri2ioW5sw0UMg5oSgei+pJsnr999198KoI
 3xae/qnkBgWhD2pghHQKHHXJnQTe9+JD+g+cMEWFK36Uxgpc2bpPeZtEaQBRaZZY
 CdPPwWuzWY6fBPOYCvrYHG86oPGuR3n03AM0nXWwRPkK2fAxsodr6UpZhQ+tjxJD
 gHGsQH1PrgH+wmiAgyaASdl+kvP0B2sRykeLcGLHT1t9Z3OGU3Jo0hxW6pGb85Da
 loF+OzhrI7Jlpk9XBJq81GdDGyNvco43gLGID2gTrNpLQ/WMW0slrCYE1WvLQ0ZQ
 3u9iUXd3X330W7cZTQgap03MNFrvruwdHnQL6uO73TKCofX15QWX86Vn16GLLlna
 etA2le4GSm0yTC9G4Z5YnAIUZdvcrT6iYbmsQ/NoGhu4aJSiQe5O9j+Tb9LoCZYs
 V2fYpUYUCsWoq+6KsPHKM0wOAHQkxkCPWDjIrqzWwrRBLfjytVEnc6JQS/ZIdap6
 GejH8CeiAnvOpD5MyVGCCih+7slQadG//+z3h7WNugZkVGqFDWc=
 =2fiZ
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEdQaENiSDAlGTDEbB7G51OISzHs0FAl+kaQwACgkQ7G51OISz
 Hs1Zhg/+OKG0w+i1rkz8nkzqQHj8FMKL5urxngxWiT8hq8VY7rXDE9Ibk2asa23a
 NNX+En/wkSl7xPB1H+HWvvMbMkhpf7XagiSS/6Qx6q7+1nBblqMizd1/oCZcGo4q
 zwXfQRSJp7auiYuHkDxvkhVXZXXQqGCK5Hj4/6gHwpPG3/W7FIFyhIjzXxdAziA/
 8p5txOsIKyxGf6uBsHQFOxpxylkc1vKBckV/2dAGOswN86CsvGd5+8KJ/Vw4qs0R
 5EsrY22VEK2E1H3ygr5Yqg4NgXkHoSYJQUeqLZGrq2Usaeg4H/vfWQJ144Hfdr4s
 S/8csXhnLVl+fAKPrHVhifC/CZTwxQGPTkK3O2Ewy9co7kQdmiSwmlztGCqXPmHa
 cBmo7mbuoGTVvLEA0jqXOhU5sJMNp1gTHYkrdIQKu0iRF4fK4WUZxO1Jh5bTwo4j
 iuaQQi/EaT1uYoibjdonT2Blk8YqVxlZpS4fiCpS+FDW3+DysiTaHKvMHE6wXG5s
 Zj6IUlgckKZbZJLgV6k28ENs17xelj75sLlOWHMl+56MLdFiDR3HiM6h4Q62G5s6
 9TnVBQpAf+pPAs3v9FV2W8dyZTPUcrrzCt9V0cJccwBleWB14q73KSVk4ScaZ2Hz
 tRfjbtvtTsAalPdqqDic7uz8OzEHR3Mv5tB9i1/ItYJ1FtVj8vQ=
 =p+Ga
 -----END PGP SIGNATURE-----

Merge tag 'v5.4.75' into 5.4-2.2.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 [2c58d5e0c7] from
upstream.

- drivers/net/can/flexcan.c:
Keep NXP implementation, patch [ca10989632] from upstream is
covered in the NXP tree.

- drivers/usb/host/xhci.h:
Fix merge fuzz for upstream commit [2600a131e1].

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
2020-11-05 21:04:13 +00:00
..
cec-drivers media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
dvb-drivers media: Documentation: fix several typos 2019-03-01 09:54:06 -05:00
kapi media: docs-rst: Clarify duration of LP-11 mode 2019-08-15 08:15:25 -03:00
uapi This is the 5.4.75 stable release 2020-11-05 21:04:13 +00:00
v4l-drivers media: imx7.rst: Fix the references to the CSI multiplexer 2019-08-07 17:06:15 -03:00
.gitignore media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
Makefile media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
audio.h.rst.exceptions media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
ca.h.rst.exceptions media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
cec.h.rst.exceptions media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
conf_nitpick.py media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
dmx.h.rst.exceptions media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
frontend.h.rst.exceptions media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
index.rst media: index.rst: exclude Indexes section from latex/pdf output 2019-03-30 09:42:35 -04:00
intro.rst media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
lirc.h.rst.exceptions media: rc: xbox_remote: add protocol and set timeout 2019-04-22 13:02:53 -04:00
media.h.rst.exceptions media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
media_kapi.rst media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
media_uapi.rst media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
net.h.rst.exceptions media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
typical_media_device.svg media: add SPDX header to media uAPI files 2018-12-05 10:39:18 -05:00
video.h.rst.exceptions media: docs: brainless mass add SPDX headers to all media files 2018-12-05 10:40:34 -05:00
videodev2.h.rst.exceptions media: videodev2.h: add V4L2_FMT_FLAG_DYN_RESOLUTION 2019-08-19 14:56:31 -03:00