| Age | Commit message (Collapse) | Author | Files | Lines | |
|---|---|---|---|---|---|
| 2012-09-22 | Merge branch 'multiplatform/platform-data' into next/multiplatform | Olof Johansson | 1 | -0/+44 | |
| * 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 <[email protected]> | |||||
| 2012-09-14 | ARM: imx: move platform_data definitions | Arnd Bergmann | 1 | -0/+46 | |
| Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the imx include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Sascha Hauer <[email protected]> Acked-by: Vinod Koul <[email protected]> Cc: Russell King <[email protected]> Cc: Dan Williams <[email protected]> Cc: "Ben Dooks (embedded platforms)" <[email protected]> Cc: "Wolfram Sang (embedded platforms)" <[email protected]> Cc: Chris Ball <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Grant Likely <[email protected]> Cc: Alan Cox <[email protected]> Cc: Felipe Balbi <[email protected]> Cc: Alan Stern <[email protected]> Cc: Florian Tobias Schandinat <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: Javier Martin <[email protected]> Cc: Shawn Guo <[email protected]> Cc: Guennadi Liakhovetski <[email protected]> | |||||