![]() Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename. Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c |
||
---|---|---|
.. | ||
include/mach | ||
adssphere.c | ||
clock.c | ||
core.c | ||
dma-m2p.c | ||
edb93xx.c | ||
gesbc9312.c | ||
gpio.c | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
micro9.c | ||
simone.c | ||
snappercl15.c | ||
ts72xx.c |