forked from luck/tmp_suning_uos_patched
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 | ||
common.c | ||
common.h | ||
d2net-setup.c | ||
db88f5281-setup.c | ||
dns323-setup.c | ||
edmini_v2-setup.c | ||
irq.c | ||
Kconfig | ||
kurobox_pro-setup.c | ||
ls_hgl-setup.c | ||
ls-chl-setup.c | ||
lsmini-setup.c | ||
Makefile | ||
Makefile.boot | ||
mpp.c | ||
mpp.h | ||
mss2-setup.c | ||
mv2120-setup.c | ||
net2big-setup.c | ||
pci.c | ||
rd88f5181l-fxo-setup.c | ||
rd88f5181l-ge-setup.c | ||
rd88f5182-setup.c | ||
rd88f6183ap-ge-setup.c | ||
terastation_pro2-setup.c | ||
ts78xx-fpga.h | ||
ts78xx-setup.c | ||
ts209-setup.c | ||
ts409-setup.c | ||
tsx09-common.c | ||
tsx09-common.h | ||
wnr854t-setup.c | ||
wrt350n-v2-setup.c |