Mark Brown fa2c8f4017 Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict ...

resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.

Linux 3.3-rc4

Conflicts:
	sound/soc/sh/fsi.c

2012-02-19 18:35:12 -08:00

..

88pm8607.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

aat2870-regulator.c

Merge remote-tracking branch 'regulator/for-linus' into regulator-next

2011-11-28 11:49:56 +00:00

ab3100.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

ab8500.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2012-01-13 20:43:32 -08:00

ad5398.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

bq24022.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

core.c

Merge tag 'v3.3-rc2' into for-3.4

2012-02-01 10:08:15 +00:00

da903x.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

da9052-regulator.c

regulator: da9052: Staticize non-exported symbols

2011-12-20 10:02:48 +00:00

db8500-prcmu.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

dummy.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

dummy.h

regulator: fix build when CONFIG_REGULATOR_DUMMY=n

2010-10-28 22:40:32 +01:00

fixed.c

regulator: set constraints.apply_uV to 0 in of_get_fixed_voltage_config

2012-01-06 11:01:09 -08:00

gpio-regulator.c

regulator: Fix compile break due to missing arguments to regulator_register

2011-11-24 10:47:56 +00:00

isl6271a-regulator.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

Kconfig

regulator: DA9052/53 Regulator support

2011-12-15 02:00:10 +08:00

lp3971.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

lp3972.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

Makefile

regulator: DA9052/53 Regulator support

2011-12-15 02:00:10 +08:00

max1586.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

max8649.c

regulator: Fix getting voltage in max8649_enable_time()

2012-02-10 11:20:55 +00:00

max8660.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

max8925-regulator.c

regulator: max8925: fix enabled/disabled judgement mistake

2012-01-06 10:56:14 -08:00

max8952.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

max8997.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

max8998.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

mc13xxx-regulator-core.c

regulator: Fix mc13xxx regulator modular build (again)

2012-02-09 22:57:46 +00:00

mc13xxx.h

regulator: mc13892: add device tree probe support

2011-12-22 11:10:45 +00:00

mc13783-regulator.c

regulator: mc13783: Convert to devm_kzalloc()

2011-12-29 17:58:37 +00:00

mc13892-regulator.c

regulator: mc13892: Convert to devm_kzalloc()

2011-12-30 02:06:29 +00:00

of_regulator.c

regulator: Set apply_uV only when min and max voltages are defined

2012-01-26 11:01:21 +00:00

pcap-regulator.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

pcf50633-regulator.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

tps6105x-regulator.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

tps6507x-regulator.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

tps6524x-regulator.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

tps6586x-regulator.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

tps65023-regulator.c

Merge remote-tracking branch 'regulator/topic/dt' into regulator-next

2011-11-23 18:50:59 +00:00

tps65910-regulator.c

Merge remote-tracking branch 'regulator/topic/dt' into regulator-next

2011-11-23 18:50:59 +00:00

tps65912-regulator.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

twl-regulator.c

Merge remote-tracking branches 'regulator/topic/dt' and 'regulator/for-linus' into regulator-next

2011-11-28 19:01:08 +00:00

userspace-consumer.c

regulator: Convert virtual and userspace regulator consumer drivers to use module_platform_driver()

2011-11-28 11:49:13 +00:00

virtual.c

regulator: Convert virtual and userspace regulator consumer drivers to use module_platform_driver()

2011-11-28 11:49:13 +00:00

wm831x-dcdc.c

regulator: Convert wm831x regulator drivers to devm_kzalloc()

2011-12-20 11:29:05 +00:00

wm831x-isink.c

regulator: Convert wm831x regulator drivers to devm_kzalloc()

2011-12-20 11:29:05 +00:00

wm831x-ldo.c

regulator: Convert wm831x regulator drivers to devm_kzalloc()

2011-12-20 11:29:05 +00:00

wm8350-regulator.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

wm8400-regulator.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00

wm8994-regulator.c

regulator: pass additional of_node to regulator_register()

2011-11-23 18:47:04 +00:00