system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-29 16:00:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
linux/arch/arm/mach-msm
History
Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup 
Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-exynos/cpu.c
	arch/arm/mach-shmobile/board-kota2.c

This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-07 11:51:28 +00:00
..
include/mach Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
acpuclock-arm11.c Fix common misspellings 2011-03-31 11:26:23 -03:00
acpuclock.h
board-halibut.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-mahimahi.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-msm7x27.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-msm7x30.c msm: boards: Fix fallout from removal of machine_desc in fixup 2011-11-01 16:10:33 -07:00
board-msm8x60.c ARM: msm: convert SMP platforms to CONFIG_MULTI_IRQ_HANDLER 2011-11-15 18:14:00 +00:00
board-msm8960.c ARM: msm: convert SMP platforms to CONFIG_MULTI_IRQ_HANDLER 2011-11-15 18:14:00 +00:00
board-qsd8x50.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-sapphire.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07: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 Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-trout.h
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 PM QoS: Move and rename the implementation files 2011-08-25 15:35:03 +02:00
clock.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
devices-iommu.c iommu/msm: Fix compile error in mach-msm/devices-iommu.c 2011-12-06 11:17:34 +01:00
devices-msm7x00.c msm: mmc: Remove "pio_irq" resource 2011-10-26 15:43:37 -04: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: mmc: Remove "pio_irq" resource 2011-10-26 15:43:37 -04:00
devices.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
dma.c
gpiomux-8x50.c msm: 8x50: Add initial support for SDCC 2011-01-21 16:58:02 -08:00
gpiomux-8x60.c
gpiomux-v1.c
gpiomux-v1.h
gpiomux-v2.c
gpiomux-v2.h
gpiomux.c
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 ARM: msm: convert logical CPU numbers to physical numbers 2011-10-17 10:01:11 +01:00
idle.S
io.c msm: Support DEBUG_LL on MSM8660 and MSM8960 2011-11-10 10:17:06 -08: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 ARM: GIC: Make MULTI_IRQ_HANDLER mandatory 2011-11-15 18:14:02 +00:00
last_radio_log.c
Makefile ARM: msm: fix compilation flags for MSM_SCM 2011-11-08 08:58:28 -08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
platsmp.c msm: platsmp: Mark ioremapped memory as __iomem 2011-11-11 10:38:08 -08:00
proc_comm.c
proc_comm.h
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 ARM: msm: fix compilation flags for MSM_SCM 2011-11-08 08:58:28 -08: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.c msm: smd: Reduce driver log chatter 2010-11-16 12:23:56 -08:00
smd_debug.c msm: smd: ifdef adjustment to remove unused variables 2010-11-16 12:25:38 -08:00
smd_private.h
timer.c ARM: gic, local timers: use the request_percpu_irq() interface 2011-10-23 13:32:33 +01:00
vreg.c