Greg Kroah-Hartman 924fb3ec50 Merge 6.2-rc7 into usb-next ... We need the USB fixes in here, and this resolves a merge conflict with the i915 driver as reported in linux-next Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2023-02-06 08:33:30 +01:00
..
cec	media: Switch to use dev_err_probe() helper	2022-12-07 17:58:46 +01:00
common	Merge 6.2-rc7 into usb-next	2023-02-06 08:33:30 +01:00
dvb-core	Driver Core changes for 6.2-rc1	2022-12-16 03:54:54 -08:00
dvb-frontends	media updates for v6.2-rc1	2022-12-13 11:36:58 -08:00
firewire	media: Makefiles: remove extra spaces	2022-03-12 16:59:52 +01:00
i2c	Merge tag 'br-v6.2i' of git://linuxtv.org/hverkuil/media_tree into media_stage	2022-12-07 17:58:47 +01:00
mc	media: mc: convert pipeline funcs to take media_pad	2022-09-24 09:22:30 +02:00
mmc	media: media/*/Kconfig: sort entries	2022-03-18 05:58:35 +01:00
pci	treewide: Convert del_timer*() to timer_shutdown*()	2022-12-25 13:38:09 -08:00
platform	media updates for v6.2-rc1	2022-12-21 09:44:41 -08:00
radio	media: si470x: Fix use-after-free in si470x_int_in_callback()	2022-12-07 17:58:47 +01:00
rc	Driver Core changes for 6.2-rc1	2022-12-16 03:54:54 -08:00
spi	media updates for v5.18-rc1	2022-03-23 14:51:35 -07:00
test-drivers	media updates for v6.2-rc1	2022-12-13 11:36:58 -08:00
tuners	Tag branch	2022-11-25 07:55:21 +00:00
usb	usb: uvc: make uvc_format_desc table const	2023-01-31 09:40:42 +01:00
v4l2-core	media: v4l2-ctrls-api.c: move ctrl->is_new = 1 to the correct line	2023-01-22 08:27:33 +01:00
Kconfig	media: Kconfig: Make DVB_CORE=m possible when MEDIA_SUPPORT=y	2022-12-07 17:58:46 +01:00
Makefile	media: Makefiles: remove extra spaces	2022-03-12 16:59:52 +01:00