Merge branch 'mali-dev' into jb-mr2-amlogic
authorKasin Lee <kasin.li@amlogic.com>
Wed, 28 Aug 2013 05:04:26 +0000 (13:04 +0800)
committerKasin Lee <kasin.li@amlogic.com>
Wed, 28 Aug 2013 05:04:26 +0000 (13:04 +0800)
commitfb361a4fa1c013d24a1b242078087f7145317d6d
tree5c448eab1c08e5aff824ce13c962555b65b146b9
parentefc919f5413fe64247808a3de745dbdf62488615
parent771cb7aea680370994f71c9566163bd13bba4e32
Merge branch 'mali-dev' into jb-mr2-amlogic

Conflicts:
mali/Kconfig
mali/platform/meson6pre/meson_main.c
mali/Kconfig
mali/platform/meson6pre/meson_main.c