| author | Bill Mills <wmills@ti.com> | |
| Mon, 9 May 2011 18:38:05 +0000 (14:38 -0400) | ||
| committer | Bill Mills <wmills@ti.com> | |
| Mon, 9 May 2011 18:38:05 +0000 (14:38 -0400) | ||
| commit | 0b33770c0582f37c1896dbc49a6bc3f0eba1b184 | |
| tree | 184f0bed4d3d43b718b57c15a10b864ec0a96470 | tree | snapshot (tar.xz tar.gz zip) |
| parent | dce161737dbaabbb6aaf14bd85bca5e445918182 | commit | diff |
| parent | 993419c22a9541e12f3c60cc24f127a2d6ab4471 | commit | diff |
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
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 | diff1 | | diff2 | | blob | history |
| src/driver/nand/nand.c | diff1 | | diff2 | | blob | history |
| src/make/Makefile | diff1 | | diff2 | | blob | history |
| src/make/makestg2 | diff1 | | diff2 | | blob | history |
| src/util/i2cConfig/i2cConfig.gel | diff1 | | diff2 | | blob | history |