git.stricted.de - GitHub/LineageOS/G12/android_hardware_amlogic_kernel-modules_mali-driver.git/commit

projects / GitHub / LineageOS / G12 / android_hardware_amlogic_kernel-modules_mali-driver.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b83592c 2614072)

author	Kasin Lee <kasin.li@amlogic.com>
	Sat, 17 May 2014 08:54:25 +0000 (16:54 +0800)
committer	Kasin Lee <kasin.li@amlogic.com>
	Sat, 17 May 2014 08:54:25 +0000 (16:54 +0800)
commit	ba19134ad55b75b2952145af50ff9408c9808f74
tree	56e319e16be98d3cb9187d2d78e5dcfb5d67e546	tree \| snapshot (tar.gz zip)
parent	b83592c22e4a036ab4fca73dc2eba25015b1f166	commit \| diff
parent	26140726fbe073ab9df62dbf5237e098a38582fd	commit \| diff

Merge branch 'mali-dev' of 10.8.9.5:/platform/hardware/arm/gpu into mali-dev

Conflicts:
mali/platform/meson_m450/platform_m8.c
mali/platform/meson_main.h
mali/platform/mpgpu.c

mali/common/mali_pmu.c	diff1 \|	diff2 \|	blob \| history
mali/platform/meson_m450/scaling_m8.c	diff1 \|	diff2 \|	blob \| history
mali/platform/mpgpu.c	diff1 \|	diff2 \|	blob \| history