| Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c | ||
|---|---|---|
| .. | ||
| dts | ||
| microblaze-generic | ||
| ml507 | ||
| ppc405-generic | ||
| ppc440-generic | ||
| zynq | ||
| Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c | ||
|---|---|---|
| .. | ||
| dts | ||
| microblaze-generic | ||
| ml507 | ||
| ppc405-generic | ||
| ppc440-generic | ||
| zynq | ||