| author | Prabhu Kuttiyam <pkuttiyam@ti.com> | |
| Mon, 28 Nov 2011 14:42:40 +0000 (09:42 -0500) | ||
| committer | Prabhu Kuttiyam <pkuttiyam@ti.com> | |
| Mon, 28 Nov 2011 14:42:40 +0000 (09:42 -0500) | ||
| commit | d39ea3b26f79c0b4a4b735f70329cc3761148323 | |
| tree | d9147e085684414418b520effff37b726ef50897 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 8da7caac81e8fa971fe88a7c153e84a57a034b4e | commit | diff |
| parent | 8f86c061ebc6bb8de271c34754a453e8bae73764 | commit | diff |
Merge branch 'linux-c6x-2.0.x' into boot-rel-exp
Conflicts:
src/device/c66x/c66x.c
src/main/iblmain.c
Conflicts:
src/device/c66x/c66x.c
src/main/iblmain.c
| src/device/c66x/c66x.c | diff1 | | diff2 | | blob | history |
| src/hw/c64x/make/makefile | diff1 | | diff2 | | blob | history |
| src/hw/uart/c66x_uart/c66x_uart.h | diff1 | | diff2 | | blob | history |