Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
9cd11c0c47
linux/arch/arm/mach-shmobile/include/mach
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
..
clkdev.h
common.h ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
dma-register.h ARM: shmobile: add common DMAEngine definitions 2012-06-30 15:03:16 +02:00
dma.h
emev2.h ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
hardware.h
head-ap4evb.txt ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot 2011-05-24 12:15:20 +09:00
head-mackerel.txt ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot 2011-05-24 12:15:20 +09:00
intc.h ARM: mach-shmobile: Introduce INTC_IRQ_PINS_16H 2012-04-11 12:11:48 +02:00
irqs.h ARM: mach-shmobile: Use 0x3400 as INTCS vector offset 2012-04-11 12:11:49 +02:00
memory.h ARM: mach-shmobile: Setup consistent dma size at boot time 2011-08-22 12:00:12 +00:00
mmc-ap4eb.h
mmc-mackerel.h
mmc.h ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL 2011-04-06 11:08:20 -07:00
pm-rmobile.h ARM: shmobile: soc-core: add R-mobile PM domain common APIs 2012-07-06 20:33:57 +02:00
r8a7740.h ARM: shmobile: r8a7740: add A4LC pm domain support 2012-07-06 20:40:17 +02:00
r8a7779.h ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
sdhi-sh7372.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sdhi.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sh73a0.h ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
sh7367.h
sh7372.h ARM: shmobile: sh7372: completely switch over to using pm-rmobile API 2012-07-06 20:53:39 +02:00
sh7377.h
system.h Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
timex.h
uncompress.h
zboot_macros.h
zboot.h ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL 2011-04-06 11:08:20 -07:00