Merge branch 'linux-c6x-2.0.x' into boot-rel-exp