Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR Conflicts: arch/arm/include/asm/arch-omap5/omap.h Signed-off-by: Tom Rini <trini@ti.com> |
||
|---|---|---|
| .. | ||
| eth | ||
| gadget | ||
| host | ||
| musb | ||
| musb-new | ||
| phy | ||
| ulpi | ||
Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR Conflicts: arch/arm/include/asm/arch-omap5/omap.h Signed-off-by: Tom Rini <trini@ti.com> |
||
|---|---|---|
| .. | ||
| eth | ||
| gadget | ||
| host | ||
| musb | ||
| musb-new | ||
| phy | ||
| ulpi | ||