Merge branch 'r4p0-01' into mali-dev
authorKasin Lee <kasin.li@amlogic.com>
Wed, 6 Aug 2014 11:54:07 +0000 (19:54 +0800)
committerKasin Lee <kasin.li@amlogic.com>
Wed, 6 Aug 2014 11:54:07 +0000 (19:54 +0800)

Trivial merge