original_kernel/drivers/mfd
Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
2010-08-16 18:42:58 +01:00
..
88pm860x-core.c mfd: Fix 88pm860x uninitialized variable and clean up 2010-08-12 11:27:18 +02:00
88pm860x-i2c.c
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 2010-08-12 10:01:30 -07:00
Makefile Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 2010-08-12 10:01:30 -07:00
ab3100-core.c
ab3100-otp.c mfd: Fix memory leak in ab3100_otp_probe 2010-08-12 11:27:17 +02:00
ab3550-core.c mfd: Staticise ab3550 register access functions 2010-08-12 11:27:22 +02:00
ab8500-core.c
ab8500-spi.c mfd: AB8500 mask off irrelevant bits from the SPI message 2010-08-12 11:27:18 +02:00
abx500-core.c mfd: kzalloc doesn't return ERR_PTR 2010-08-12 11:27:19 +02:00
adp5520.c
asic3.c
da903x.c
davinci_voicecodec.c mfd: Fix davinci memory leak 2010-08-12 11:27:20 +02:00
dm355evm_msp.c
ezx-pcap.c
htc-egpio.c
htc-i2cpld.c
htc-pasic3.c
janz-cmodio.c mfd: Missing slab.h includes 2010-08-12 11:28:10 +02:00
jz4740-adc.c mfd: Check jz4740-adc kmalloc() result 2010-08-12 11:28:02 +02:00
lpc_sch.c
max8925-core.c
max8925-i2c.c
max8998.c
mc13783-core.c mfd: Get rid of now unused mc13783 private header 2010-08-12 11:28:04 +02:00
mcp-core.c
mcp-sa11x0.c
menelaus.c mfd: Use macros instead of some constant magic numbers for menelaus 2010-08-12 11:28:11 +02:00
mfd-core.c mfd: properly handle platform_device_add_resources fail in mfd_add_device 2010-08-12 11:27:19 +02:00
pcf50633-adc.c
pcf50633-core.c
pcf50633-gpio.c
pcf50633-irq.c
rdc321x-southbridge.c
sh_mobile_sdhi.c
sm501.c
stmpe.c mfd: Add stmpe auto sleep feature 2010-08-12 11:28:00 +02:00
stmpe.h mfd: Add stmpe auto sleep feature 2010-08-12 11:28:00 +02:00
t7l66xb.c mfd: Properly free t7l66xb clk32k clock source 2010-08-12 11:27:23 +02:00
tc6387xb.c mfd: Annotate tc6387xb probe/remove routines with __devinit/__devexit 2010-08-12 11:28:06 +02:00
tc6393xb.c mfd: Fix wrong goto labels for tc6393xb error handling 2010-08-12 11:28:05 +02:00
tc35892.c
timberdale.c
timberdale.h
tmio_core.c
tps6507x.c mfd: Fix incorrect kfree(i2c) in tps6507x i2c_driver probe 2010-08-12 11:28:12 +02:00
tps6586x.c mfd: Add TPS6586x driver 2010-08-12 11:28:12 +02:00
tps65010.c
twl-core.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
twl4030-codec.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
twl4030-irq.c
twl4030-power.c
twl6030-irq.c
twl6030-pwm.c mfd: Add support for TWL6030 PWM 2010-08-12 11:27:59 +02:00
ucb1x00-assabet.c
ucb1x00-core.c
ucb1x00-ts.c
ucb1400_core.c mfd: Avoid calling platform_device_put() twice in ucb1400 probe error path 2010-08-12 11:28:06 +02:00
wm831x-core.c mfd: Fix incorrect kfree(i2c) in wm831x-core i2c_driver probe 2010-08-12 11:28:13 +02:00
wm831x-irq.c
wm831x-otp.c
wm8350-core.c mfd: Fix wrong wm8350-core kfree in error path 2010-08-12 11:28:08 +02:00
wm8350-gpio.c
wm8350-i2c.c
wm8350-irq.c
wm8350-regmap.c
wm8400-core.c
wm8994-core.c mfd: Fix incorrect kfree(i2c) in wm8994-core i2c_driver probe 2010-08-12 11:28:14 +02:00
wm8994-irq.c