linux/arch/arm/mach-msm
Arnd Bergmann a7fadac10f Merge branch 'depends/rmk/devel-stable' into next/board
The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos4/include/mach/entry-macro.S
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-exynos4/mct.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01 00:11:41 +01:00
..
include/mach Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
acpuclock-arm11.c Fix common misspellings 2011-03-31 11:26:23 -03:00
acpuclock.h arm: msm: add cpu frequency controls 2010-05-12 09:14:20 -07:00
board-halibut.c ARM: mach-msm: convert boot_params to atag_offset 2011-08-21 17:14:59 -04:00
board-mahimahi.c ARM: mach-msm: convert boot_params to atag_offset 2011-08-21 17:14:59 -04:00
board-msm7x27.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
board-msm7x30.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
board-msm8x60.c Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable 2011-10-23 14:42:30 +01:00
board-msm8960.c ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs 2011-08-13 11:26:18 +01:00
board-qsd8x50.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
board-sapphire.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
board-trout-gpio.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
board-trout-mmc.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-trout-panel.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-trout.c ARM: mach-msm: convert boot_params to atag_offset 2011-08-21 17:14:59 -04:00
board-trout.h Add GPIO support for HTC Dream. 2010-06-15 13:19:43 -07:00
clock-7x30.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
clock-debug.c msm: clock: Remove references to clk_ops_pcom 2011-02-28 12:40:05 -08:00
clock-pcom.c msm: clock: Remove references to clk_ops_pcom 2011-02-28 12:40:05 -08:00
clock-pcom.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
clock.c msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
clock.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
devices-iommu.c msm: iommu: Remove dependency on IDR 2011-03-08 14:40:59 -08:00
devices-msm7x00.c msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
devices-msm7x30.c msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
devices-msm8960.c msm: serial: Add MSM8960 serial support 2011-01-28 12:27:21 -08:00
devices-qsd8x50.c msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
devices.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
dma.c msm: dma: add completion.h header 2010-06-07 16:16:33 -07:00
gpiomux-8x50.c msm: 8x50: Add initial support for SDCC 2011-01-21 16:58:02 -08:00
gpiomux-8x60.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v1.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v1.h msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v2.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v2.h msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux.h msm: gpiomux: Move public API to public header 2011-08-01 04:58:00 -07:00
headsmp.S msm: headsmp.S: Fix section mismatch 2011-02-28 12:40:05 -08:00
hotplug.c msm: hotplug: support cpu hotplug on msm 2011-01-07 15:54:44 -08:00
idle.S
io.c msm: Remove chip-ifdefs for GPIO io mappings 2011-08-01 04:57:59 -07:00
irq-vic.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
Kconfig Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next 2011-08-01 15:16:05 +01:00
last_radio_log.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
Makefile Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next 2011-08-01 15:16:05 +01:00
Makefile.boot
platsmp.c ARM: smp: fix clipping of number of CPUs 2011-10-20 22:06:57 +01:00
proc_comm.c arm: msm: smd: fix SMD modem processor sync condition 2010-05-12 09:19:33 -07:00
proc_comm.h arm: msm: smd: fix SMD modem processor sync condition 2010-05-12 09:19:33 -07:00
scm-boot.c msm: scm-boot: Support for setting cold/warm boot addresses 2011-01-07 15:54:43 -08:00
scm-boot.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
scm.c Fix common misspellings 2011-03-31 11:26:23 -03:00
scm.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
sirc.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
smd_debug.c msm: smd: ifdef adjustment to remove unused variables 2010-11-16 12:25:38 -08:00
smd_private.h arm: msm: smd: msm7x30 a2m clean up 2010-05-12 09:19:04 -07:00
smd.c msm: smd: Reduce driver log chatter 2010-11-16 12:23:56 -08:00
timer.c ARM: gic, local timers: use the request_percpu_irq() interface 2011-10-23 13:32:33 +01:00
vreg.c [ARM] msm: add new vreg IDs for MSM7X30 2010-05-12 09:14:41 -07:00