David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
cec	media: cec: increase debug level for 'queue full'	2018-11-06 05:23:05 -05:00
common	media: Add a Kconfig option for the Request API	2018-12-05 13:07:43 -05:00
dvb-core	media updates for v4.20-rc1	2018-10-31 10:53:29 -07:00
dvb-frontends	media: dvb-pll: don't re-validate tuner frequencies	2018-11-27 13:51:32 -05:00
firewire	media: replace strcpy() by strscpy()	2018-09-11 13:32:17 -04:00
i2c	media: tc358743: Remove unnecessary self assignment	2018-11-06 05:19:49 -05:00
mmc	media: siano: use GFP_DMA only for smssdio	2018-05-15 08:04:42 -04:00
pci	media: ipu3-cio2: Use cio2_queues_exit	2018-11-06 07:11:59 -05:00
platform	media: vicodec: set state resolution from raw format	2018-12-03 15:04:36 -05:00
radio	media: replace strcpy() by strscpy()	2018-09-11 13:32:17 -04:00
rc	media: bpf: add bpf function to report mouse movement	2018-12-09 14:37:18 -08:00
spi	media: cxd2880-spi: Modified how to declare structure	2018-05-05 10:37:12 -04:00
tuners	media: si2157: declare its own pads	2018-09-17 13:16:19 -04:00
usb	media: gspca: fix frame overflow error	2018-11-22 13:44:38 -05:00
v4l2-core	media: mpeg2-ctrls.h: move MPEG2 state controls to non-public header	2018-12-05 13:06:31 -05:00
Kconfig	media: Add a Kconfig option for the Request API	2018-12-05 13:07:43 -05:00
Makefile	media: media-request: implement media requests	2018-08-31 11:04:51 -04:00
media-device.c	media: Add a Kconfig option for the Request API	2018-12-05 13:07:43 -05:00
media-devnode.c	MAINTAINERS & files: Canonize the e-mails I use at files	2018-05-04 06:21:06 -04:00
media-entity.c	media: v4l2-mc: switch it to use the new approach to setup pipelines	2018-09-17 13:16:19 -04:00
media-request.c	media: media-request: Add compat ioctl	2018-11-20 12:53:27 -05:00