Linus Torvalds 3c83e61e67 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ... Pull media updates from Mauro Carvalho Chehab: "The main set of series of patches for media subsystem, including: - document RC sysfs class - added an API to setup scancode to allow waking up systems using the Remote Controller - add API for SDR devices. Drivers are still on staging - some API improvements for getting EDID data from media inputs/outputs - new DVB frontend driver for drx-j (ATSC) - one driver (it913x/it9137) got removed, in favor of an improvement on another driver (af9035) - added a skeleton V4L2 PCI driver at documentation - added a dual flash driver (lm3646) - added a new IR driver (img-ir) - added an IR scancode decoder for the Sharp protocol - some improvements at the usbtv driver, to allow its core to be reused. - added a new SDR driver (rtl2832u_sdr) - added a new tuner driver (msi001) - several improvements at em28xx driver to fix PM support, device removal and to split the V4L2 specific bits into a separate sub-driver - one driver got converted to videobuf2 (s2255drv) - the e4000 tuner driver now follows an improved binding model - some fixes at V4L2 compat32 code - several fixes and enhancements at videobuf2 code - some cleanups at V4L2 API documentation - usual driver enhancements, new board additions and misc fixups" [ NOTE! This merge effective drops commit 4329b93b28 ("of: Reduce indentation in of_graph_get_next_endpoint"). The of_graph_get_next_endpoint() function was moved and renamed by commit fd9fdb78a9 ("[media] of: move graph helpers from drivers/media/v4l2-core to drivers/of"). It was originally called v4l2_of_get_next_endpoint() and lived in the file drivers/media/v4l2-core/v4l2-of.c. In that original location, it was then fixed to support empty port nodes by commit b9db140c1e ("[media] v4l: of: Support empty port nodes"), and that commit clashes badly with the dropped "Reduce intendation" commit. I had to choose one or the other, and decided that the "Support empty port nodes" commit was more important ] * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (426 commits) [media] em28xx-dvb: fix PCTV 461e tuner I2C binding Revert "[media] em28xx-dvb: fix PCTV 461e tuner I2C binding" [media] em28xx: fix PCTV 290e LNA oops [media] em28xx-dvb: fix PCTV 461e tuner I2C binding [media] m88ds3103: fix bug on .set_tone() [media] saa7134: fix WARN_ON during resume [media] v4l2-dv-timings: add module name, description, license [media] videodev2.h: add parenthesis around macro arguments [media] saa6752hs: depends on CRC32 [media] si4713: fix Kconfig dependencies [media] Sensoray 2255 uses videobuf2 [media] adv7180: free an interrupt on failure paths in init_device() [media] e4000: make VIDEO_V4L2 dependency optional [media] af9033: Don't export functions for the hardware filter [media] af9035: use af9033 PID filters [media] af9033: implement PID filter [media] rtl2832_sdr: do not use dynamic stack allocation [media] e4000: fix 32-bit build error [media] em28xx-audio: make sure audio is unmuted on open() [media] DocBook media: v4l2_format_sdr was renamed to v4l2_sdr_format ...		2014-04-04 09:50:07 -07:00
..
Kconfig	[media] omap24xx/tcm825x: move to staging for future removal	2013-12-20 13:45:22 -02:00
Makefile	[media] omap24xx/tcm825x: move to staging for future removal	2013-12-20 13:45:22 -02:00
tuner-core.c	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
v4l2-async.c	[media] v4l2-async: Don't use dynamic static allocation	2013-11-08 09:45:43 -02:00
v4l2-clk.c	[media] V4L2: add v4l2-clock helpers to register and unregister a fixed-rate clock	2013-10-31 04:31:30 -02:00
v4l2-common.c	media: core: Don't use i2c_client->driver	2013-10-03 22:28:23 +02:00
v4l2-compat-ioctl32.c	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-04-04 09:50:07 -07:00
v4l2-ctrls.c	[media] v4l: add control for RF tuner PLL lock flag	2014-03-13 10:26:49 -03:00
v4l2-dev.c	[media] v4l2: add VIDIOC_G/S_EDID support to the v4l2 core	2014-03-11 10:06:53 -03:00
v4l2-device.c	[media] v4l2-device: check if already unregistered	2013-06-21 11:00:51 -03:00
v4l2-dv-timings.c	[media] v4l2-dv-timings: add module name, description, license	2014-03-28 18:09:48 -03:00
v4l2-event.c	[media] V4L: Add v4l2_event_subdev_unsubscribe() helper function	2013-02-05 15:04:55 -02:00
v4l2-fh.c	[media] v4l, smiapp, smiapp-pll, adp1653: Update contact information	2012-11-21 13:34:50 -02:00
v4l2-ioctl.c	[media] v4l: rename v4l2_format_sdr to v4l2_sdr_format	2014-03-13 11:00:35 -03:00
v4l2-mem2mem.c	[media] V4L: Add mem2mem ioctl and file operation helpers	2013-12-04 15:34:24 -02:00
v4l2-of.c	[media] v4l: of: Support empty port nodes	2014-03-11 09:38:49 -03:00
v4l2-subdev.c	[media] v4l2: add VIDIOC_G/S_EDID support to the v4l2 core	2014-03-11 10:06:53 -03:00
videobuf2-core.c	[media] vb2: call buf_finish after the state check	2014-03-11 06:56:44 -03:00
videobuf2-dma-contig.c	dma-buf: avoid using IS_ERR_OR_NULL	2014-02-07 14:21:09 -08:00
videobuf2-dma-sg.c	Merge branch 'upstream-fixes' into patchwork	2013-12-13 05:04:00 -02:00
videobuf2-memops.c	[media] v4l: vb2-dma-contig: let mmap method to use dma_mmap_coherent call	2012-11-25 17:20:25 -02:00
videobuf2-vmalloc.c	[media] videobuf2: add gfp_flags	2013-03-21 13:17:51 -03:00
videobuf-core.c	[media] v4l: Tell user space we're using monotonic timestamps	2012-12-21 11:20:51 -02:00
videobuf-dma-contig.c	[media] Revert "[media] videobuf_vm_{open,close} race fixes"	2014-02-04 06:29:46 -02:00
videobuf-dma-sg.c	[media] Revert "[media] videobuf_vm_{open,close} race fixes"	2014-02-04 06:29:46 -02:00
videobuf-dvb.c
videobuf-vmalloc.c	[media] Revert "[media] videobuf_vm_{open,close} race fixes"	2014-02-04 06:29:46 -02:00