kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux-hardened/arch/arm/mach-ep93xx
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
adssphere.c ARM: ep93xx: use machine specific hook for late init 2012-05-05 14:20:34 +08:00
clock.c ep93xx: Make syscon access functions private to SoC 2012-03-14 11:43:06 +11:00
core.c ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00
crunch-bits.S ep93xx: Move crunch code to mach-ep93xx directory 2012-03-14 11:43:10 +11:00
crunch.c ARM: ep93xx: use machine specific hook for late init 2012-05-05 14:20:34 +08:00
dma.c ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00
edb93xx.c ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00
gesbc9312.c ARM: ep93xx: use machine specific hook for late init 2012-05-05 14:20:34 +08:00
Kconfig arm: ep93xx: use gpio_led_register_device 2012-04-12 09:38:15 +10:00
Makefile ep93xx: Move crunch code to mach-ep93xx directory 2012-03-14 11:43:10 +11:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
micro9.c ARM: ep93xx: use machine specific hook for late init 2012-05-05 14:20:34 +08:00
simone.c ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00
snappercl15.c ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00
soc.h ep93xx: IDE driver platform support code 2012-06-04 14:40:46 +10:00
ts72xx.c - More robust parsing especially of xattr data in JFFS2 2012-06-01 16:55:42 -07:00
vision_ep9307.c ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00