leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fb6f3d69af
linux/arch/arm/mach-exynos
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
..
include/mach Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
clock-exynos4.c ARM: arm-soc soc updates, take 2 2012-07-30 09:45:53 -07:00
clock-exynos4.h ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file 2012-07-17 07:52:03 +09:00
clock-exynos5.c ARM: EXYNOS: cleanup unused code related to GPS 2012-08-28 09:01:56 -07:00
clock-exynos4210.c ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file 2012-07-17 07:52:03 +09:00
clock-exynos4212.c ARM: EXYNOS: Add G2D related clock entries for SMDK4X12 2012-07-17 07:52:03 +09:00
common.c arm-soc: soc-specific updates 2012-07-23 16:08:40 -07:00
common.h ARM: SoC: convert Exynos4 to SMP operations 2012-09-14 11:14:50 +02:00
cpuidle.c Merge branch 'late/soc' into devel-late 2012-05-30 16:06:46 -07:00
dev-ahci.c ARM: EXYNOS: Use common macro to define resources on dev-ahci.c 2012-05-12 16:12:19 +09:00
dev-audio.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
dev-drm.c ARM: EXYNOS: add platform device for core DRM subsystem 2012-05-12 06:42:33 +09:00
dev-dwmci.c ARM: EXYNOS: Fix resource on dev-dwmci.c 2012-04-24 13:50:00 -07:00
dev-ohci.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
dev-sysmmu.c ARM: EXYNOS: Change System MMU platform device definitions 2012-04-04 09:23:02 -07:00
dev-uart.c ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5 2012-03-14 02:13:05 -07:00
dma.c ARM: EXYNOS: Support DMA for EXYNOS5250 SoC 2012-05-13 08:20:04 +09:00
headsmp.S ARM: exynos: remove incorrect BSYM usage 2012-01-16 08:36:04 -06:00
hotplug.c ARM: consolidate pen_release instead of having per platform definitions 2012-09-14 11:15:01 +02:00
Kconfig ARM: EXYNOS: Add DRM device to SMDK4X12 board 2012-07-19 14:41:01 +09:00
mach-armlex4210.c ARM: SoC: convert Exynos4 to SMP operations 2012-09-14 11:14:50 +02:00
mach-exynos4-dt.c ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4 2012-07-14 10:57:09 +09:00
mach-exynos5-dt.c ARM: SoC: convert Exynos4 to SMP operations 2012-09-14 11:14:50 +02:00
mach-nuri.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-origen.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-smdk4x12.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-smdkv310.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-universal_c210.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
Makefile ARM: EXYNOS: Add PMU table for EXYNOS5250 2012-05-20 03:13:17 +09:00
Makefile.boot ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
mct.c ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition 2012-05-15 16:59:33 +09:00
platsmp.c ARM: consolidate pen_release instead of having per platform definitions 2012-09-14 11:15:01 +02:00
pm_domains.c ARM: exynos: exynos_pm_add_dev_to_genpd may be unused 2012-08-10 12:27:34 +02:00
pm.c ARM: EXYNOS: Support suspend and resume for EXYNOS5250 2012-05-20 03:14:36 +09:00
pmu.c ARM: EXYNOS: Add missing static storage class specifier in pmu.c file 2012-07-13 06:46:08 +09:00
setup-fimc.c
setup-fimd0.c
setup-i2c0.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c1.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c2.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c3.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c4.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c5.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c6.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c7.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-keypad.c
setup-sdhci-gpio.c
setup-spi.c ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions 2012-07-13 15:23:46 +09:00
setup-usb-phy.c ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12 2012-07-13 06:45:55 +09:00