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> |
||
---|---|---|
.. | ||
act200l-sir.c | ||
actisys-sir.c | ||
ali-ircc.c | ||
ali-ircc.h | ||
au1k_ir.c | ||
bfin_sir.c | ||
bfin_sir.h | ||
donauboe.c | ||
donauboe.h | ||
ep7211-sir.c | ||
esi-sir.c | ||
girbil-sir.c | ||
irda-usb.c | ||
irda-usb.h | ||
irtty-sir.c | ||
irtty-sir.h | ||
Kconfig | ||
kingsun-sir.c | ||
ks959-sir.c | ||
ksdazzle-sir.c | ||
litelink-sir.c | ||
ma600-sir.c | ||
Makefile | ||
mcp2120-sir.c | ||
mcs7780.c | ||
mcs7780.h | ||
nsc-ircc.c | ||
nsc-ircc.h | ||
old_belkin-sir.c | ||
pxaficp_ir.c | ||
sa1100_ir.c | ||
sh_irda.c | ||
sh_sir.c | ||
sir_dev.c | ||
sir_dongle.c | ||
sir-dev.h | ||
smsc-ircc2.c | ||
smsc-ircc2.h | ||
smsc-sio.h | ||
stir4200.c | ||
tekram-sir.c | ||
toim3232-sir.c | ||
via-ircc.c | ||
via-ircc.h | ||
vlsi_ir.c | ||
vlsi_ir.h | ||
w83977af_ir.c | ||
w83977af_ir.h | ||
w83977af.h |