Linus Torvalds ab11ca34ee 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: - some V4L2 API updates needed by embedded devices - DVB API extensions for ATSC-MH delivery system, used in US for mobile TV - new tuners for fc0011/0012/0013 and tua9001 - a new dvb driver for af9033/9035 - a new ATSC-MH frontend (lg2160) - new remote controller keymaps - Removal of a few legacy webcam driver that got replaced by gspca on several kernel versions ago - a new driver for Exynos 4/5 webcams(s5pp fimc-lite) - a new webcam sensor driver (smiapp) - a new video input driver for embedded (sta2x1xx) - several improvements, fixes, cleanups, etc inside the drivers. Manually fix up conflicts due to err() -> dev_err() conversion in drivers/staging/media/easycap/easycap_main.c * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (484 commits) [media] saa7134-cards: Remove a PCI entry added by mistake [media] radio-sf16fmi: add support for SF16-FMD [media] rc-loopback: remove duplicate line [media] patch for Asus My Cinema PS3-100 (1043:48cd) [media] au0828: Move the Kconfig knob under V4L_USB_DRIVERS [media] em28xx: simple comment fix [media] [resend] radio-sf16fmr2: add PnP support for SF16-FMD2 [media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new_custom() [media] smiapp: Add support for 8-bit uncompressed formats [media] smiapp: Allow generic quirk registers [media] smiapp: Use non-binning limits if the binning limit is zero [media] smiapp: Initialise rval in smiapp_read_nvm() [media] smiapp: Round minimum pre_pll up rather than down in ip_clk_freq check [media] smiapp: Use 8-bit reads only before identifying the sensor [media] smiapp: Quirk for sensors that only do 8-bit reads [media] smiapp: Pass struct sensor to register writing commands instead of i2c_client [media] smiapp: Allow using external clock from the clock framework [media] zl10353: change .read_snr() to report SNR as a 0.1 dB [media] media: add support to gspca/pac7302.c for 093a:2627 (Genius FaceCam 300) [media] m88rs2000 - only flip bit 2 on reg 0x70 on 16th try ...		2012-05-24 10:21:51 -07:00
..
aoa	ALSA: aoa: Convert onyx and tas codec drivers to module_i2c_driver	2012-01-27 15:18:28 +01:00
arm	ARM: cleanups of io includes	2012-03-29 18:02:10 -07:00
atmel	ALSA: atmel/ac97c: correct the unexpected behavior when using uninitial value for reset pin	2012-05-11 12:10:04 +02:00
core	Merge branch 'topic/misc' into for-linus	2012-05-21 12:51:35 +02:00
drivers	ALSA: snd-aloop - improve the sample copy accurracy	2012-05-15 08:34:38 +02:00
firewire	ALSA: firewire-lib: optimize packet flushing	2012-05-14 10:43:43 +02:00
i2c	[media] v4l2-dev: rename two functions	2012-05-14 15:06:50 -03:00
isa	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-05-22 19:22:50 -07:00
mips
oss	sound: sound/oss/msnd_pinnacle.c: add vfrees	2012-04-10 08:41:54 +02:00
parisc
pci	Sound updates for 3.5-rc1	2012-05-23 13:05:43 -07:00
pcmcia
ppc	Merge branch 'topic/misc' into for-linus	2012-01-12 09:59:14 +01:00
sh	ALSA: sh: Fix up namespace collision in sh_dac_audio.	2012-05-21 11:31:14 +02:00
soc	Sound updates for 3.5-rc1	2012-05-23 13:05:43 -07:00
sparc
spi	ALSA: Convert at73c213 to module_spi_driver	2012-01-27 15:18:36 +01:00
synth
usb	ALSA: snd-usb: fix stream info output in /proc	2012-05-21 12:51:08 +02:00
ac97_bus.c
Kconfig
last.c	ALSA: workaround: change the timing of alsa_sound_last_init()	2012-04-19 13:51:54 +02:00
Makefile
sound_core.c	sound: allow the unit search until 256 in sound_core.c	2012-05-08 17:27:03 +02:00
sound_firmware.c