e3a66aa33a
* 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> |
||
|---|---|---|
| .. | ||
| anubis-cpld.h | ||
| anubis-irq.h | ||
| anubis-map.h | ||
| bast-cpld.h | ||
| bast-irq.h | ||
| bast-map.h | ||
| debug-macro.S | ||
| dma.h | ||
| entry-macro.S | ||
| fb.h | ||
| gpio-fns.h | ||
| gpio-nrs.h | ||
| gpio-track.h | ||
| gpio.h | ||
| gta02.h | ||
| h1940-latch.h | ||
| h1940.h | ||
| hardware.h | ||
| idle.h | ||
| io.h | ||
| irqs.h | ||
| map.h | ||
| osiris-cpld.h | ||
| osiris-map.h | ||
| otom-map.h | ||
| pm-core.h | ||
| regs-clock.h | ||
| regs-dsc.h | ||
| regs-gpio.h | ||
| regs-irq.h | ||
| regs-lcd.h | ||
| regs-mem.h | ||
| regs-power.h | ||
| regs-s3c2412-mem.h | ||
| regs-s3c2412.h | ||
| regs-s3c2416-mem.h | ||
| regs-s3c2416.h | ||
| regs-s3c2443-clock.h | ||
| regs-sdi.h | ||
| tick.h | ||
| timex.h | ||
| uncompress.h | ||
| vr1000-cpld.h | ||
| vr1000-irq.h | ||
| vr1000-map.h | ||