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

..

boot

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

common

Merge branch 'depends/irqdomain' into next/drivers

2012-03-05 16:58:11 +00:00

configs

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

include/asm

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

kernel

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

lib

ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts

2012-01-25 11:07:40 +00:00

mach-at91

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-bcmring

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-clps711x

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-cns3xxx

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-davinci

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

mach-dove

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-ebsa110

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-ep93xx

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

mach-exynos

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

mach-footbridge

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-gemini

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-h720x

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-highbank

Linux 3.3-rc2

2012-02-07 15:05:20 -08:00

mach-imx

Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers

2012-03-24 11:29:58 +00:00

mach-integrator

Merge branch 'amba' into for-armsoc

2012-01-26 19:59:44 +00:00

mach-iop13xx

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-iop32x

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-iop33x

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-ixp4xx

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-ixp23xx

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-ixp2000

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-kirkwood

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-ks8695

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-l7200/include/mach

ARM: add an extra temp register to the low level debugging addruart macro

2011-09-26 10:11:25 -04:00

mach-lpc32xx

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

mach-mmp

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-msm

Merge branch 'depends/irqdomain' into next/drivers

2012-03-05 16:58:11 +00:00

mach-mv78xx0

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-mxs

Merge branch 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers

2012-02-28 12:21:17 +00:00

mach-netx

Merge branch 'amba' into for-armsoc

2012-01-26 19:59:44 +00:00

mach-nomadik

Merge branch 'amba' into for-armsoc

2012-01-26 19:59:44 +00:00

mach-omap1

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

mach-omap2

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

mach-orion5x

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-picoxcell

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-pnx4008

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-prima2

Merge branch 'depends/irqdomain' into next/drivers

2012-03-05 16:58:11 +00:00

mach-pxa

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

mach-realview

Linux 3.3-rc2

2012-02-07 15:05:20 -08:00

mach-rpc

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-s3c64xx

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-s3c2410

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-s3c2412

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-s3c2416

Merge branch 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

2012-03-13 16:22:20 -07:00

mach-s3c2440

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

mach-s3c2443

Merge branch 'lpc32xx/drivers' into next/drivers

2012-02-22 14:20:18 +00:00

mach-s5p64x0

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-s5pc100

Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static

2012-03-07 03:34:41 -08:00

mach-s5pv210

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-sa1100

Merge branch 'rtc-sa1100' of git://github.com/hzhuang1/linux into next/drivers

2012-02-28 12:38:46 +00:00

mach-shark

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-shmobile

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-spear3xx

Merge branch 'amba' into for-armsoc

2012-01-26 19:59:44 +00:00

mach-spear6xx

Merge branch 'amba' into for-armsoc

2012-01-26 19:59:44 +00:00

mach-tegra

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-u300

Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers

2012-03-24 11:29:58 +00:00

mach-ux500

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

mach-versatile

Merge branch 'depends/irqdomain' into next/drivers

2012-03-05 16:58:11 +00:00

mach-vexpress

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

mach-vt8500

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-w90x900

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mach-zynq

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05:00

mm

ARM: 7345/1: errata: update workaround for A9 erratum #743622

2012-02-27 11:22:08 +00:00

nwfpe

ARM: 7207/1: Use generic ARM instruction set condition code checks for nwfpe.

2011-12-13 08:52:02 +00:00

oprofile

oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue

2011-12-23 11:58:34 +01:00

plat-iop

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-11 18:50:26 -08:00

plat-mxc

Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers

2012-03-24 11:29:58 +00:00

plat-nomadik

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-01-17 18:40:24 -08:00

plat-omap

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

plat-orion

ARM: orion: Fix USB phy for orion5x.

2012-02-09 16:16:35 -08:00

plat-pxa

Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers

2011-11-23 20:47:41 +00:00

plat-s3c24xx

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

plat-s5p

ARM: SAMSUNG: use static declaration when it is not used in other files

2012-01-21 13:06:18 +09:00

plat-samsung

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

plat-spear

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

plat-versatile

ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP

2012-01-23 10:20:05 +00:00

tools

ARM: Update mach-types

2011-12-23 22:58:10 +00:00

vfp

arm: remove several unnecessary module.h include instances

2011-10-31 19:30:48 -04:00

Kconfig

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

Kconfig-nommu

…

Kconfig.debug

Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers

2012-02-28 12:23:27 +00:00

Makefile

Revert "ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and SOC_OMAP_NOOP"

2012-03-05 16:02:18 -08:00