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
..
88pm860x-core.c	mfd: Adopt mfd_data in 88pm860x input driver	2011-03-23 10:42:06 +01:00
88pm860x-i2c.c	mfd: Append additional read write on 88pm860x	2011-03-23 10:42:07 +01:00
ab3100-core.c	mfd: Rename platform_data field of mfd_cell to mfd_data	2011-03-23 10:41:55 +01:00
ab3100-otp.c	mfd: Fix memory leak in ab3100_otp_probe	2010-08-12 11:27:17 +02:00
ab3550-core.c	mfd: Rename platform_data field of mfd_cell to mfd_data	2011-03-23 10:41:55 +01:00
ab8500-core.c	mfd: ab8500-core switch off status added	2011-03-23 10:42:02 +01:00
ab8500-debugfs.c	mfd: ab8500: world-writable debugfs register-* files	2011-03-23 10:41:48 +01:00
ab8500-gpadc.c	mfd: Rename ab8500 gpadc header	2011-03-23 10:42:11 +01:00
ab8500-i2c.c	mfd: AB8500 register access via PRCMU I2C	2010-10-29 00:29:26 +02:00
ab8500-sysctrl.c	mfd: AB8500 system control driver	2011-03-23 10:41:47 +01:00
abx500-core.c	mfd: kzalloc doesn't return ERR_PTR	2010-08-12 11:27:19 +02:00
adp5520.c	mfd: Convert adp5520 to dev_pm_ops	2011-03-23 10:41:43 +01:00
asic3.c	mmc: Use mfd_data instead of driver_data for tmio-mmc	2011-03-23 10:41:56 +01:00
cs5535-mfd.c	mfd: Add sharing for cs5535 acpi/pms cells	2011-03-23 10:41:58 +01:00
da903x.c	mfd: Fix da903x_add_subdevs error path	2010-10-29 00:28:56 +02:00
davinci_voicecodec.c	asoc: davinci_voicecodec: use mfd_data instead of driver_data	2011-03-23 10:41:56 +01:00
dm355evm_msp.c	mfd: Correct ro and cd implemantion on DM355	2009-09-17 09:46:54 +02:00
ezx-pcap.c	mfd: Convert ezx-pcap to new irq_ methods	2011-01-14 12:37:53 +01:00
htc-egpio.c	mfd: Convert HTC EGPIO driver to irq_ API	2011-01-14 12:37:54 +01:00
htc-i2cpld.c	mfd: Convert HTC I2C CPLD driver to irq_ API	2011-01-14 12:37:55 +01:00
htc-pasic3.c	w1: Use mfd_data instead of driver_data for dsw1wm.c	2011-03-23 10:41:56 +01:00
janz-cmodio.c	mfd: Rename platform_data field of mfd_cell to mfd_data	2011-03-23 10:41:55 +01:00
jz4740-adc.c	mfd: mfd_cell is now implicitly available to jz4740 drivers	2011-03-23 10:41:50 +01:00
Kconfig	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
lpc_sch.c	mfd: Add Tunnel Creek support to lpc_sch	2011-03-23 10:42:08 +01:00
Makefile	mfd: Add a core driver for TI TPS61050/TPS61052 chips v2	2011-03-23 10:42:09 +01:00
max8925-core.c	mfd: Convert max8925 to new irq_ API	2011-01-14 12:38:01 +01:00
max8925-i2c.c	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
max8997.c	mfd: MAX8997/8966 support	2011-03-23 10:42:03 +01:00
max8998-irq.c	mfd: MAX8998/LP3974 hibernation support	2011-01-14 12:38:14 +01:00
max8998.c	mfd: Staticise non-exported symbols in MAX8998 driver	2011-03-23 10:41:43 +01:00
mc13xxx-core.c	mfd: Add MODULE_DEVICE_TABLE to mc13xxx-core	2011-03-23 10:41:59 +01:00
mcp-core.c	move drivers/mfd/*.h to include/linux/mfd	2009-11-27 21:07:18 +01:00
mcp-sa11x0.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
menelaus.c	mfd: update workqueue usages	2010-12-24 16:00:17 +01:00
mfd-core.c	mfd: Rename mfd_shared_cell_{en,dis}able to drop the "shared" part	2011-03-23 10:42:03 +01:00
omap-usb-host.c	usb: host: omap: common usb host core driver	2011-03-01 17:02:22 +02:00
pcf50633-adc.c	mfd: pcf50633-adc: Fix potential race in pcf50633_adc_sync_read	2010-05-28 01:37:49 +02:00
pcf50633-core.c	mfd: Add MODULE_DEVICE_TABLE to pcf50633-core	2011-03-23 10:41:59 +01:00
pcf50633-gpio.c	mfd/pcf50633-gpio.c: add MODULE_LICENSE	2009-06-17 19:41:30 +02:00
pcf50633-irq.c	mfd: Move pcf50633 irq related functions to its own file.	2010-05-28 01:37:50 +02:00
rdc321x-southbridge.c	rdc321x-southbridge: Use mfd_data instead of driver_data	2011-03-23 10:41:57 +01:00
sh_mobile_sdhi.c	mmc: Use mfd_data instead of driver_data for tmio-mmc	2011-03-23 10:41:56 +01:00
sm501.c	video, sm501: add OF binding to support SM501	2011-03-22 17:17:14 +09:00
stmpe.c	mfd: Convert SMTPE driver to new irq_ APIs	2011-01-14 12:38:02 +01:00
stmpe.h	mfd: Add stmpe auto sleep feature	2010-08-12 11:28:00 +02:00
t7l66xb.c	mtd: Use mfd_data instead of driver_data for tmio_nand	2011-03-23 10:41:57 +01:00
tc3589x.c	input/tc3589x: add tc3589x keypad support	2010-12-29 22:02:24 +01:00
tc6387xb.c	mmc: Use mfd_data instead of driver_data for tmio-mmc	2011-03-23 10:41:56 +01:00
tc6393xb.c	fb: Use mfd_data instead of driver_data for tmio-fb	2011-03-23 10:41:57 +01:00
ti-ssp.c	mfd: add driver for sequencer serial port	2011-03-15 08:17:22 -07:00
timberdale.c	mfd: Rename platform_data field of mfd_cell to mfd_data	2011-03-23 10:41:55 +01:00
timberdale.h	[media] mfd: Add timberdale video-in driver to timberdale	2010-12-29 08:16:46 -02:00
tmio_core.c	mfd: tmio_mmc hardware abstraction for CNF area	2010-01-18 12:30:27 +01:00
tps6105x.c	mfd: Add a core driver for TI TPS61050/TPS61052 chips v2	2011-03-23 10:42:09 +01:00
tps6507x.c	mfd: Fix off-by-one value range checking for tps6507x	2010-10-29 00:30:29 +02:00
tps6586x.c	mfd: Invert tps6586x GPIO and subdevices initialization	2011-03-23 10:41:45 +01:00
tps65010.c	mfd: Include <linux/gpio.h> instead of <asm/gpio.h>	2011-01-14 12:37:36 +01:00
twl4030-codec.c	mfd: Rename platform_data field of mfd_cell to mfd_data	2011-03-23 10:41:55 +01:00
twl4030-irq.c	mfd: Convert TWL4030 to new irq_ APIs	2011-01-14 12:38:09 +01:00
twl4030-madc.c	mfd: Add "platform:" prefix for twl4030-madc platform modalias	2011-03-23 10:42:05 +01:00
twl4030-power.c	mfd: Switch twl4030-power over to defines in twl.h	2010-10-29 00:28:49 +02:00
twl6030-irq.c	mfd: twl6030 irq_data conversion.	2011-01-14 12:38:11 +01:00
twl6030-pwm.c	mfd: Add support for TWL6030 PWM	2010-08-12 11:27:59 +02:00
twl-core.c	mfd: Enabling twl4030_wdt and pwrbutton only for Triton	2011-03-23 10:41:49 +01:00
twl-core.h	mfd: Fix twl-irq function declaration warnings	2010-10-29 00:30:16 +02:00
ucb1x00-assabet.c	move drivers/mfd/*.h to include/linux/mfd	2009-11-27 21:07:18 +01:00
ucb1x00-core.c	mfd: Fix ucb1x00 build failure for collie_defconfig	2010-03-07 22:17:39 +01:00
ucb1x00-ts.c	mfd: Add BTN_TOUCH event to ucb1x00-ts	2011-03-23 10:41:45 +01:00
ucb1400_core.c	mfd: Avoid calling platform_device_put() twice in ucb1400 probe error path	2010-08-12 11:28:06 +02:00
vx855.c	mfd: Add MODULE_DEVICE_TABLE to vx855	2011-03-23 10:41:59 +01:00
wl1273-core.c	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
wm831x-core.c	mfd: Add WM8326 support	2011-01-14 12:37:39 +01:00
wm831x-i2c.c	mfd: Remove copy from WM831x I2C write function	2011-03-23 10:42:09 +01:00
wm831x-irq.c	mfd: Convert WM831x interrupt masking to enable/disable operations	2011-03-23 10:42:00 +01:00
wm831x-otp.c	mfd: Add basic WM831x OTP support	2009-09-17 09:46:59 +02:00
wm831x-spi.c	mfd: Convert WM831x SPI to use dev_pm_ops	2011-03-23 10:41:45 +01:00
wm8350-core.c	mfd: Fix wrong wm8350-core kfree in error path	2010-08-12 11:28:08 +02:00
wm8350-gpio.c	mfd: Add GPIO pin configuration support for WM8350	2008-10-13 21:51:55 +01:00
wm8350-i2c.c	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
wm8350-irq.c	mfd: Convert Wolfson MFD drivers to use irq_data accessor function	2011-01-14 12:38:10 +01:00
wm8350-regmap.c	mfd: Remove build time warning for WM835x register default tables	2009-12-13 19:21:53 +01:00
wm8400-core.c	asoc: wm8400-codec: Use mfd_data instead of driver_data	2011-03-23 10:41:56 +01:00
wm8994-core.c	mfd: Push byte swaps out of wm8994 bulk read path	2011-03-23 10:42:11 +01:00
wm8994-irq.c	mfd: Push byte swaps out of wm8994 bulk read path	2011-03-23 10:42:11 +01:00