leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0d601f613b
linux/arch/arm/mach-exynos/include/mach
History
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform 
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 01:07:21 -07:00
..
cpufreq.h EXYNOS5250: Add support cpufreq for EXYNOS5250 2012-03-14 14:39:50 -04:00
debug-macro.S ARM: EXYNOS: fix CONFIG_DEBUG_LL 2012-04-04 09:27:19 -07:00
dma.h
dwmci.h
gpio.h ARM: EXYNOS: add GPC4 bank instance 2012-05-16 07:03:01 +09:00
hardware.h
irqs.h ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4 2012-07-14 10:57:09 +09:00
map.h ARM: EXYNOS: cleanup unused code related to GPS 2012-08-28 09:01:56 -07:00
memory.h
pm-core.h ARM: EXYNOS: Support suspend and resume for EXYNOS5250 2012-05-20 03:14:36 +09:00
pmu.h ARM: EXYNOS: Add PMU table for EXYNOS5250 2012-05-20 03:13:17 +09:00
regs-audss.h
regs-clock.h ARM: EXYNOS: Add Clock register list for save and restore 2012-05-20 03:13:21 +09:00
regs-gpio.h ARM: EXYNOS: support EINT for EXYNOS4 and EXYNOS5 2012-03-14 02:35:14 -07:00
regs-irq.h
regs-mct.h
regs-mem.h
regs-pmu.h ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset 2012-07-12 16:15:08 +09:00
regs-usb-phy.h ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12 2012-07-13 06:45:55 +09:00
sysmmu.h ARM: EXYNOS: Change System MMU platform device definitions 2012-04-04 09:23:02 -07:00
timex.h
uncompress.h ARM: EXYNOS: use chip_id reg in uncompress to select uart base phys 2012-04-04 09:27:37 -07:00