davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
511f1cb6d4
kernel-ark/arch/arm
History
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
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
mach-cns3xxx
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
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
mach-gemini
mach-h720x
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
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-ixp23xx
mach-ixp2000
mach-kirkwood Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-ks8695
mach-l7200/include/mach
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
mach-pnx4008
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
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
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
mach-w90x900
mach-zynq
mm ARM: 7345/1: errata: update workaround for A9 erratum #743622 2012-02-27 11:22:08 +00:00
nwfpe
oprofile
plat-iop
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
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
plat-s3c24xx Merge branch 'next/fixes-non-critical' into next/drivers 2012-03-20 22:42:24 +00:00
plat-s5p
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
tools
vfp
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