Merge branch 'nysh_multi_boot'
authorBill Mills <wmills@ti.com>
Mon, 9 May 2011 18:38:05 +0000 (14:38 -0400)
committerBill Mills <wmills@ti.com>
Mon, 9 May 2011 18:38:05 +0000 (14:38 -0400)
commit0b33770c0582f37c1896dbc49a6bc3f0eba1b184
tree184f0bed4d3d43b718b57c15a10b864ec0a96470
parentdce161737dbaabbb6aaf14bd85bca5e445918182
parent993419c22a9541e12f3c60cc24f127a2d6ab4471
Merge branch 'nysh_multi_boot'

Conflicts:
doc/release_info.txt
src/hw/ddrs/emif4/emif4.c
src/ibl.h
src/make/setupenv.bat
src/make/setupenvMsys.sh
src/util/i2cConfig/i2cConfig.gel

Manual overrides
release.sh
src/driver/nand.c
src/make/Makefile
src/make/makestg1
src/make/makestg2
src/util/i2cConfig/i2cparam.c
src/util/i2cConfig/i2cConfig.gel
release.sh
src/driver/nand/nand.c
src/make/Makefile
src/make/makestg2
src/util/i2cConfig/i2cConfig.gel