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
..
cx88-alsa.c	[media] Convert to snd_card_new() with a device pointer	2014-02-14 08:14:09 +01:00
cx88-blackbird.c	[media] v4l2: pass std by value to the write-only s_std ioctl	2013-03-24 06:47:00 -03:00
cx88-cards.c	[media] cx88: remove g_chip_ident	2013-06-21 10:30:38 -03:00
cx88-core.c	[media] cx88: set dev_parent to the correct parent PCI bus	2013-06-21 11:08:07 -03:00
cx88-dsp.c
cx88-dvb.c	[media] cx88: kernel bz#9476: Fix tone setting for Nova-S+ model 92001	2013-04-08 06:56:47 -03:00
cx88-i2c.c	[media] cx88: Replace memcpy with struct assignment	2012-12-27 19:01:51 -02:00
cx88-input.c	[media] rc: abstract access to allowed/enabled protocols	2014-03-11 13:24:39 -03:00
cx88-mpeg.c	[media] misc drivers: remove deprecated IRQF_DISABLED	2013-10-17 06:08:31 -03:00
cx88-reg.h
cx88-tvaudio.c
cx88-vbi.c
cx88-video.c	[media] misc drivers: remove deprecated IRQF_DISABLED	2013-10-17 06:08:31 -03:00
cx88-vp3054-i2c.c	[media] cx88: Replace memcpy with struct assignment	2012-12-27 19:01:51 -02:00
cx88-vp3054-i2c.h	[media] use IS_ENABLED() macro	2013-02-06 09:24:09 -02:00
cx88.h	[media] cx88: Fix regression: CX88_AUDIO_WM8775 can't be 0	2013-09-03 09:24:22 -03:00
Kconfig	[media] cx88: fix build when VP3054=m and CX88_DVB=y	2013-08-24 07:55:06 -03:00
Makefile	[media] btcx-risc: move from media/i2c to media/common	2013-02-08 16:11:25 -02:00