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
..
atmel	ASoC: Fix codec device id format used by some dai_links	2011-01-25 15:12:36 +00:00
au1x	ASoC: Do not include soc-dapm.h	2010-11-22 14:04:41 +00:00
blackfin	ASoC: Fix codec device id format used by some dai_links	2011-01-25 15:12:36 +00:00
codecs	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
davinci	asoc: davinci_voicecodec: use mfd_data instead of driver_data	2011-03-23 10:41:56 +01:00
ep93xx	ASoC: Enable 192kHz sample rate for EP93xx.	2011-03-09 13:08:42 +00:00
fsl	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2011-03-18 10:46:37 -07:00
imx	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-tcc into devel-stable	2011-03-12 20:33:51 +00:00
jz4740	ASoC: Do not include soc-dapm.h	2010-11-22 14:04:41 +00:00
kirkwood	ASoC: Do not include soc-dapm.h	2010-11-22 14:04:41 +00:00
mid-x86	ASoC: sst_platform: fix the pulseaudio error	2011-02-15 17:59:17 -08:00
nuc900	Merge branch 'for-2.6.37' into for-2.6.38	2010-11-30 11:35:43 +00:00
omap	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2011-03-18 10:46:37 -07:00
pxa	ASoC: PXA: Z2: Fix codec pin name	2011-03-11 12:03:13 +00:00
s6000	ASoC: Remove needless inclusion of tlv320aic3x.h from machine drivers	2011-01-05 11:28:50 +00:00
samsung	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
sh	ASoC: sh: fsi: modify selection method of I2S/PCM/SPDIF format	2011-01-26 11:25:47 +00:00
tegra	ASoC: Tegra: Fix error handling in DMA channel alloc	2011-02-28 15:10:03 +00:00
txx9
Kconfig	ASoC: tegra: Kconfig and Makefile	2011-01-10 22:21:09 +00:00
Makefile	ASoC: tegra: Kconfig and Makefile	2011-01-10 22:21:09 +00:00
soc-cache.c	ASoC: soc-cache: dereferencing before checking	2011-02-08 11:27:45 +00:00
soc-core.c	ASoC: Remove bogus check for register validity in debugfs write	2011-03-18 10:51:42 +00:00
soc-dapm.c	Merge branch 'for-2.6.38' into for-2.6.39	2011-03-09 12:37:42 +00:00
soc-jack.c	ASoC: Pass the jack to jack notifiers	2011-02-24 09:42:33 +00:00
soc-utils.c	ASoC: Use snd_pcm_format_width() in snd_soc_params_to_frame_size()	2011-02-01 14:31:40 +00:00