projects / GitHub / LineageOS / G12 / android_hardware_amlogic_kernel-modules_mali-driver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ba19134 525771c)
Merge branch 'r4p0-01' into mali-dev
authorKasin Lee <kasin.li@amlogic.com>
Tue, 5 Aug 2014 08:08:33 +0000 (16:08 +0800)
committerKasin Lee <kasin.li@amlogic.com>
Tue, 5 Aug 2014 08:08:33 +0000 (16:08 +0800)
commitbe32978263edbc21bcd0e3a462f26a2c10e0967d
treeece0236ebd5287d946cb6f94d7ccac33c62ca6b1tree | snapshot (tar.gz zip)
parentba19134ad55b75b2952145af50ff9408c9808f74commit | diff
parent525771c5ad99565eaeeab2a9d9bf991994e644fbcommit | diff
Merge branch 'r4p0-01' into mali-dev

Conflicts:
mali/common/mali_mmu.c
mali/common/mali_pmu.c
mali/linux/mali_osk_irq.c
mali/platform/mali_clock.c
mali/platform/meson_m450/platform_m8.c
mali/platform/meson_m450/platform_m8b.c
mali/platform/meson_m450/scaling_m8.c
mali/platform/meson_m450/scaling_m8b.c
mali/platform/meson_main.h
mali/platform/mpgpu.c

Change-Id: I21563425e0923c3faaf78a84fdbe02b203b6ffcd
mali/Kbuild diff1 | diff2 | blob | history
mali/common/mali_group.c diff1 | diff2 | blob | history
mali/common/mali_mmu.c diff1 | diff2 | blob | history
mali/common/mali_mmu.h diff1 | diff2 | blob | history
mali/common/mali_pmu.c diff1 | diff2 | blob | history
mali/common/mali_pp_scheduler.c diff1 | diff2 | blob | history
mali/linux/mali_osk_irq.c diff1 | diff2 | blob | history
mali/linux/mali_sync.c diff1 | diff2 | blob | history
mali/platform/mali_clock.c diff1 | diff2 | blob | history
mali/platform/meson_m450/platform_m8.c diff1 | diff2 | blob | history
mali/platform/meson_m450/platform_m8b.c diff1 | diff2 | blob | history