sugar/linux
1
0
Fork 0
Code Activity
Files
25468fe89f88c4ceeef94526e94ae0db176f6999
linux/arch/arm/mach-msm
History
Olof Johansson 25468fe89f Merge branch 'multiplatform/smp_ops' into next/multiplatform 
* multiplatform/smp_ops:
  ARM: consolidate pen_release instead of having per platform definitions
  ARM: smp: Make SMP operations mandatory
  ARM: SoC: convert spear13xx to SMP operations
  ARM: SoC: convert imx6q to SMP operations
  ARM: SoC: convert highbank to SMP operations
  ARM: SoC: convert shmobile SMP to SMP operations
  ARM: SoC: convert ux500 to SMP operations
  ARM: SoC: convert MSM to SMP operations
  ARM: SoC: convert Exynos4 to SMP operations
  ARM: SoC: convert Tegra to SMP operations
  ARM: SoC: convert OMAP4 to SMP operations
  ARM: SoC: convert VExpress/RealView to SMP operations
  ARM: SoC: add per-platform SMP operations

Conflicts due to file moves or removals in:
	arch/arm/mach-msm/board-msm8960.c
	arch/arm/mach-msm/board-msm8x60.c
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to board file cleanup:
	arch/arm/mach-tegra/board-paz00.c

Conflicts due to cpu hotplug addition:
	arch/arm/mach-tegra/hotplug.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 00:16:04 -07:00
..
include/mach
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
board-dt-8660.c
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
board-dt-8960.c
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
board-halibut.c
ARM: msm: Allow timer.c to compile on multiple targets
2012-09-13 11:14:37 -07:00
board-mahimahi.c
ARM: msm: Remove msm_hw_reset_hook
2012-09-13 10:43:57 -07:00
board-msm7x30.c
ARM: msm: Allow timer.c to compile on multiple targets
2012-09-13 11:14:37 -07:00
board-qsd8x50.c
ARM: msm: Allow timer.c to compile on multiple targets
2012-09-13 11:14:37 -07:00
board-sapphire.c
ARM: msm: Remove msm_hw_reset_hook
2012-09-13 10:43:57 -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: msm: trout: fix compile failure
2012-04-13 10:23:16 -07:00
board-trout.c
ARM: msm: Allow timer.c to compile on multiple targets
2012-09-13 11:14:37 -07: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
ARM: msm: clock-pcom: Mark functions static
2012-09-13 10:45:02 -07: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
common.h
ARM: msm: Remove non-DT targets from 8960
2012-09-13 11:17:01 -07:00
core.h
ARM: SoC: convert MSM to SMP operations
2012-09-14 11:14:57 +02: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-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
ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail
2012-09-13 11:12:50 -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
ARM: msm: Add missing ENDPROC to headsmp.S
2012-01-16 08:36:02 -06:00
hotplug.c
ARM: consolidate pen_release instead of having per platform definitions
2012-09-14 11:15:01 +02:00
io.c
Merge tag 'msm-dt-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/dt
2012-09-16 18:03:50 -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
ARM: msm: Remove non-DT targets from 8960
2012-09-13 11:17:01 -07:00
last_radio_log.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
Makefile
Merge tag 'msm-dt-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/dt
2012-09-16 18:03:50 -07:00
Makefile.boot
ARM: dtb: move all dtb targets to common Makefile
2012-09-20 22:58:17 -07:00
platsmp.c
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
proc_comm.c
ARM: msm: Remove msm_hw_reset_hook
2012-09-13 10:43:57 -07:00
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 (part 2)
2012-05-11 11:08:37 -07: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
ARM: msm: use machine specific hook for late init
2012-05-08 20:36:17 +08:00
smd_private.h
…
smd.c
ARM: msm: Remove msm_hw_reset_hook
2012-09-13 10:43:57 -07:00
timer.c
Merge tag 'msm-dt-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/dt
2012-09-16 18:03:50 -07:00
vreg.c
ARM: msm: vreg is a module and so needs module.h
2012-01-06 11:07:57 -08:00