Conflicts: arch/arm/include/asm/arch-zynq/hardware.h The conflict above was trivial and solved during merge. |
||
|---|---|---|
| .. | ||
| dts | ||
| microblaze-generic | ||
| ml507 | ||
| ppc405-generic | ||
| ppc440-generic | ||
| zynq | ||
Conflicts: arch/arm/include/asm/arch-zynq/hardware.h The conflict above was trivial and solved during merge. |
||
|---|---|---|
| .. | ||
| dts | ||
| microblaze-generic | ||
| ml507 | ||
| ppc405-generic | ||
| ppc440-generic | ||
| zynq | ||