Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 10:39:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Browse source 
Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c
This commit is contained in:
Albert ARIBAUD 2013-05-30 14:45:06 +02:00
commit a19b0dd62d
305 changed files with 8284 additions and 15437 deletions
Download patch file Download diff file Expand all files Collapse all files

2
board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
View file

@ -20,7 +20,7 @@
* Foundation Inc. 51 Franklin Street Fifth Floor Boston,
* MA 02110-1301 USA
*
* Refer docs/README.imxmage for more details about how-to configure
* Refer doc/README.imximage for more details about how-to configure
* and create imximage boot image
*
* The syntax is taken as close as possible with the kwbimage