]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:57:29 +0000 (11:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:57:29 +0000 (11:57 +1000)
commit869c74bc9d5e1ceef7cc460569dbda579fe7f767
tree2ed4061ebba9d781a149f503993fdfda700af096
parent03a6c48dfcbe106b1ccc4809578f0d19a8e08c0e
parent4f4e6644cd876c844cdb3bea2dd7051787d5ae25
Merge remote-tracking branch 'v4l-dvb/master'

# Conflicts:
# MAINTAINERS
MAINTAINERS
drivers/media/pci/cx25821/cx25821-alsa.c
drivers/media/pci/ivtv/ivtv-driver.c
drivers/media/platform/coda/coda-common.c
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
drivers/media/rc/Makefile
drivers/media/rc/keymaps/Makefile
include/media/rc-map.h