Arnd Bergmann 511f1cb6d4 Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers ... The pxa regulator branch removes the bq24022 driver, while a lot of other regulator drivers got added in the regulator tree. This resolves the trivial conflicts by merging in the regulator patches that are already merged into v3.4. Conflicts: drivers/regulator/Kconfig drivers/regulator/Makefile Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-24 11:29:58 +00:00
..
devices	ARM: mxc: ahci: add clk_prepare/clk_unprepare	2012-02-01 14:27:59 +01:00
include/mach	Merge branch 'next/fixes-non-critical' into next/drivers	2012-03-20 22:42:24 +00:00
3ds_debugboard.c	ARM i.MX 3ds debugboard: register a dummy regulator for the smsc911x device	2012-03-03 16:32:47 +00:00
audmux-v1.c
audmux-v2.c	ARM: mxc: audmux-v2: add clk_prepare/clk_unprepare	2012-02-01 14:28:00 +01:00
avic.c	ARM:i.MX: fix build error in tzic/avic.c	2011-11-04 03:54:17 +08:00
clock.c
cpu.c
cpufreq.c	arm/imx: fix cpufreq section mismatch	2011-12-19 12:26:05 +01:00
devices.c	Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:11:00 -07:00
epit.c	ARM: mxc: epit: add clk_prepare/clk_unprepare	2012-02-01 14:28:00 +01:00
iomux-v1.c
iomux-v3.c
iram_alloc.c
irq-common.c	ARM i.MX avic: convert to use generic irq chip	2011-09-23 08:32:14 +02:00
irq-common.h	ARM i.MX avic: convert to use generic irq chip	2011-09-23 08:32:14 +02:00
Kconfig	Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.	2012-01-23 14:50:30 -08:00
Makefile	ARM: imx: convert smp platforms to global gic_handle_irq()	2011-11-15 18:13:59 +00:00
pwm.c	ARM: mxc: pwm: add clk_prepare/clk_unprepare	2012-02-01 14:27:59 +01:00
ssi-fiq-ksym.c
ssi-fiq.S
system.c	ARM: mxc: arch_reset: add clk_prepare/clk_unprepare	2012-02-01 14:28:00 +01:00
time.c	ARM: mxc: time: add clk_prepare/clk_unprepare	2012-02-01 14:27:59 +01:00
tzic.c	ARM: mx5: use generic irq chip pm interface for pm functions on	2011-12-25 12:02:28 +08:00
ulpi.c