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

..

anubis-cpld.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

anubis-irq.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

anubis-map.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

bast-cpld.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

bast-irq.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

bast-map.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

debug-macro.S

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

dma.h

ARM: S3C24XX: Add missing DMACH_DT_PROP

2012-08-08 09:04:50 +09:00

entry-macro.S

Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

2012-03-08 08:53:14 -08:00

fb.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

gpio-fns.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

gpio-nrs.h

ARM: S3C24XX: Remove unused GPA, GPE, GPH bank GPIO aliases

2012-07-13 18:05:20 +09:00

gpio-track.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

gpio.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

gta02.h

ARM: S3C24XX: Remove unused GPIO definitions for Openmoko GTA02 board

2012-07-13 18:05:45 +09:00

h1940-latch.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

h1940.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

hardware.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

idle.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

io.h

ARM: cleanups of io includes

2012-03-29 18:02:10 -07:00

irqs.h

ARM: S3C24XX: add support for second irq set of S3C2416

2012-05-20 03:05:04 +09:00

map.h

ARM: S3C24XX: Add map entries needed by the s3c64xx-spi devices

2012-04-24 18:06:58 -07:00

osiris-cpld.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

osiris-map.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

otom-map.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

pm-core.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-clock.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-dsc.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-gpio.h

ARM: S3C24XX: Remove unused GPIO definitions for port J

2012-07-13 18:05:29 +09:00

regs-irq.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-lcd.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-mem.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-power.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-s3c2412-mem.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-s3c2412.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-s3c2416-mem.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-s3c2416.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-s3c2443-clock.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

regs-sdi.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

tick.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

timex.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

uncompress.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

vr1000-cpld.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

vr1000-irq.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00

vr1000-map.h

ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/

2012-03-03 07:47:38 +09:00