mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 01:51:53 +00:00
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> |
||
---|---|---|
.. | ||
include/mach | ||
addr-map.c | ||
board-dnskw.c | ||
board-dreamplug.c | ||
board-dt.c | ||
board-goflexnet.c | ||
board-ib62x0.c | ||
board-iconnect.c | ||
board-lsxl.c | ||
board-ts219.c | ||
common.c | ||
common.h | ||
cpuidle.c | ||
d2net_v2-setup.c | ||
db88f6281-bp-setup.c | ||
dockstar-setup.c | ||
guruplug-setup.c | ||
irq.c | ||
Kconfig | ||
lacie_v2-common.c | ||
lacie_v2-common.h | ||
Makefile | ||
Makefile.boot | ||
mpp.c | ||
mpp.h | ||
mv88f6281gtw_ge-setup.c | ||
netspace_v2-setup.c | ||
netxbig_v2-setup.c | ||
openrd-setup.c | ||
pcie.c | ||
rd88f6192-nas-setup.c | ||
rd88f6281-setup.c | ||
sheevaplug-setup.c | ||
t5325-setup.c | ||
ts41x-setup.c | ||
ts219-setup.c | ||
tsx1x-common.c | ||
tsx1x-common.h |