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
..
ab8500	mfd: Rename ab8500 gpadc header	2011-03-23 10:42:11 +01:00
pcf50633
wm831x	mfd: Add platform data to support multiple WM831x devices per board	2011-03-23 10:42:01 +01:00
wm8350
wm8994	mfd: Constify WM8994 write path	2011-03-23 10:42:11 +01:00
88pm860x.h	mfd: Append additional read write on 88pm860x	2011-03-23 10:42:07 +01:00
ab8500.h	mfd: ab8500 chip revision 3.0 support	2011-03-23 10:42:02 +01:00
abx500.h	mfd: mfd_cell is now implicitly available to ab3550 driver	2011-03-23 10:41:51 +01:00
adp5520.h
asic3.h
core.h	mfd: Rename mfd_shared_cell_{en,dis}able to drop the "shared" part	2011-03-23 10:42:03 +01:00
da903x.h
davinci_voicecodec.h
ds1wm.h
ezx-pcap.h
htc-egpio.h
htc-pasic3.h
janz.h
max8925.h
max8997-private.h	mfd: MAX8997/8966 support	2011-03-23 10:42:03 +01:00
max8997.h	regulator: MAX8997/8966 support	2011-03-23 10:42:07 +01:00
max8998-private.h	mfd: MAX8998/LP3974 hibernation support	2011-01-14 12:38:14 +01:00
max8998.h	regulator: Support MAX8998/LP3974 DVS-GPIO	2011-01-14 12:38:16 +01:00
mc13xxx.h	mfd: mfd_cell is now implicitly available to mc13xxx drivers	2011-03-23 10:41:54 +01:00
mc13783.h	Change the register name definitions for mc13783	2011-01-12 14:33:03 +00:00
mc13892.h	regulator: support PMIC mc13892	2011-01-12 14:33:03 +00:00
mcp.h
rdc321x.h
sh_mobile_sdhi.h
stmpe.h
t7l66xb.h
tc3589x.h
tc6387xb.h
tc6393xb.h
ti_ssp.h	spi: add ti-ssp spi master driver	2011-03-15 08:17:22 -07:00
tmio.h	mmc: tmio_mmc: implement SDIO IRQ support	2011-01-08 23:52:30 -05:00
tps6105x.h	regulator: Add a subdriver for TI TPS6105x regulator portions v2	2011-03-23 10:42:09 +01:00
tps6507x.h
tps6586x.h
twl4030-codec.h
ucb1x00.h
wl1273-core.h	[media] MFD: WL1273 FM Radio: MFD driver for the FM radio	2011-03-21 20:32:39 -03:00
wm8400-audio.h
wm8400-private.h
wm8400.h