projects / GitHub / LineageOS / G12 / android_hardware_amlogic_kernel-modules_mali-driver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2b6330a ae39dba)
Merge branch 'r4p0-01' of git://git.myamlogic.com/platform/hardware/arm/gpu into...
authorKasin Lee <kasin.li@amlogic.com>
Mon, 21 Jul 2014 07:04:18 +0000 (15:04 +0800)
committerKasin Lee <kasin.li@amlogic.com>
Mon, 21 Jul 2014 07:04:18 +0000 (15:04 +0800)
commit7559b946c94fe7ba020bb1e84e60dc8cdbd96a55
treea908c2b5cf57bf9cca724cf906d5e28400af1162tree | snapshot (tar.gz zip)
parent2b6330a0bcc5e831e4b22cb20b7a1bc3c49b39cecommit | diff
parentae39dbaec5c0ea26fafeaf557ce022c55a9ad899commit | diff
Merge branch 'r4p0-01' of git://git.myamlogic.com/platform/hardware/arm/gpu into r4p0-01

Conflicts:
mali/Kbuild
mali/platform/meson_m450/platform_m6tvd.c
mali/platform/meson_m450/scaling.c
mali/Kbuild diff1 | diff2 | blob | history
mali/platform/meson_m450/scaling.c diff1 | diff2 | blob | history