e4862f2f6f
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/plat | ||
| Kconfig | ||
| Makefile | ||
| clock.c | ||
| common.c | ||
| cpu-omap.c | ||
| debug-devices.c | ||
| debug-leds.c | ||
| devices.c | ||
| dma.c | ||
| dmtimer.c | ||
| fb.c | ||
| gpio.c | ||
| i2c.c | ||
| io.c | ||
| iommu-debug.c | ||
| iommu.c | ||
| iopgtable.h | ||
| iovmm.c | ||
| mailbox.c | ||
| mcbsp.c | ||
| mux.c | ||
| ocpi.c | ||
| omap-pm-noop.c | ||
| omap_device.c | ||
| sram.c | ||
| usb.c | ||