edit conflict
authorKasin Lee <kasin.li@amlogic.com>
Fri, 27 Sep 2013 05:50:47 +0000 (13:50 +0800)
committerKasin Lee <kasin.li@amlogic.com>
Fri, 27 Sep 2013 05:50:47 +0000 (13:50 +0800)
commitbe91db06c4bb57e2fc8ef0e45cb4702f2e3694aa
tree6459466edd42db1169436e8b065ba85130a45d42
parentfa8c7ef272c93a866dcdee70487e0be4e8d4b063
parent6a147f0e69fabe4136420889161c54f2de424831
edit conflict
mali/Kconfig
mali/platform/meson8/mali_scaling.c