.gitignore · 1a4596601fd395f3afb8f82f3f840c5e00bdd57a · Jack Humbert / reform-boundary-uboot · GitLab

Snippets Groups Projects

Forked from Reform / reform-boundary-uboot

11 years ago
a19b0dd6
Merge branch 'u-boot/master' into 'u-boot-arm/master' · a19b0dd6
Albert ARIBAUD authored 11 years ago
```
Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c
```
a19b0dd6

History
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Albert ARIBAUD authored 11 years ago
```
Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c
```