Linus Torvalds 76d21c5635 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 ... * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits) [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE [media] v4l: soc-camera: Store negotiated buffer settings [media] rc: interim support for 32-bit NEC-ish scancodes [media] mceusb: topseed 0x0011 needs gen3 init for tx to work [media] lirc_zilog: error out if buffer read bytes != chunk size [media] lirc: silence some compile warnings [media] hdpvr: use same polling interval as other OS [media] ir-kbd-i2c: pass device code w/key in hauppauge case [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping [media] rc-rc5-hauppauge-new: Add support for the old Black RC [media] rc-rc5-hauppauge-new: Add the old control to the table [media] rc-winfast: Fix the keycode tables [media] a800: Fix a few wrong IR key assignments [media] opera1: Use multimedia keys instead of an app-specific mapping [media] dw2102: Use multimedia keys instead of an app-specific mapping ... Fix up trivial conflicts (remove/modify and some real conflicts) in: arch/arm/mach-omap2/devices.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h drivers/staging/easycap/easycap_ioctl.c drivers/staging/usbvideo/usbvideo.c drivers/staging/usbvideo/vicam.c		2011-03-24 09:50:13 -07:00
..
aoa	Merge branch 'topic/workq-update' into topic/misc	2010-12-13 09:29:52 +01:00
arm	Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers	2011-03-17 11:04:51 +00:00
atmel	ALSA: fix invalid hardware.h include in ac97c for AVR32 architecture	2011-01-25 18:07:10 +01:00
core	Merge branch 'topic/misc' into for-linus	2011-03-18 07:39:08 +01:00
drivers	ALSA: aloop - Fix possible IRQ lock inversion	2011-03-18 07:31:53 +01:00
firewire	ALSA: firewire - msleep needs delay.h	2011-03-16 07:47:33 +01:00
i2c	sound: don't use flush_scheduled_work()	2010-12-13 09:22:44 +01:00
isa	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
mips
oss	Merge branch 'fix/misc' into topic/misc	2011-03-11 14:48:09 +01:00
parisc
pci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2011-03-23 07:58:09 -07:00
pcmcia	ALSA: use linux/io.h to fix compile warnings	2011-02-02 17:49:53 +01:00
ppc	ALSA: powermac - Allow input from microphone on Tumbler	2011-02-28 11:19:17 +01:00
sh	sound: sh: ctrl_in/outX to __raw_read/writeX conversion.	2010-10-27 15:53:50 +09:00
soc	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-03-24 09:50:13 -07:00
sparc	dt/sound: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
spi	ALSA: AT73C213: Rectify misleading comment.	2010-11-11 02:03:29 +01:00
synth
usb	ALSA: usb - Remove trailing spaces from USB card name strings	2011-03-21 12:32:44 +01:00
ac97_bus.c	sound: Fixed line limit issue in sound/ac97_bus.c	2010-12-06 16:09:49 +01:00
Kconfig	ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver	2011-03-15 08:42:22 +01:00
last.c
Makefile	ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver	2011-03-15 08:42:22 +01:00
sound_core.c	sound: Use sound_register_*() for additional OSS minor devices	2011-03-09 20:10:37 +01:00
sound_firmware.c	sound: read i_size with i_size_read()	2011-03-18 15:14:57 +01:00