Merge branch 'linux-c6x-2.0.x' into boot-rel-exp
authorPrabhu Kuttiyam <pkuttiyam@ti.com>
Mon, 28 Nov 2011 14:42:40 +0000 (09:42 -0500)
committerPrabhu Kuttiyam <pkuttiyam@ti.com>
Mon, 28 Nov 2011 14:42:40 +0000 (09:42 -0500)
commitd39ea3b26f79c0b4a4b735f70329cc3761148323
treed9147e085684414418b520effff37b726ef50897
parent8da7caac81e8fa971fe88a7c153e84a57a034b4e
parent8f86c061ebc6bb8de271c34754a453e8bae73764
Merge branch 'linux-c6x-2.0.x' into boot-rel-exp

Conflicts:
src/device/c66x/c66x.c
src/main/iblmain.c
src/device/c66x/c66x.c
src/hw/c64x/make/makefile
src/hw/uart/c66x_uart/c66x_uart.h