smdk4412: merge mali r4p0 driver

Change-Id: Ief824b1dce642fd2133900cd2b0f108fbfa89b1c

Conflicts:
	arch/arm/configs/custom_i9300_defconfig
	arch/arm/mach-exynos/clock-exynos4.c
	arch/arm/mach-exynos/tmu.c
	arch/arm/plat-s5p/clock.c
	drivers/gpu/Makefile
	drivers/gpu/arm/mali/common/mali_block_allocator.h
	drivers/gpu/arm/mali/common/mali_gp.h
	drivers/gpu/arm/mali/common/mali_gp_job.c
	drivers/gpu/arm/mali/common/mali_gp_job.h
	drivers/gpu/arm/mali/common/mali_hw_core.c
	drivers/gpu/arm/mali/common/mali_hw_core.h
	drivers/gpu/arm/mali/common/mali_kernel_descriptor_mapping.c
	drivers/gpu/arm/mali/common/mali_kernel_descriptor_mapping.h
	drivers/gpu/arm/mali/common/mali_kernel_mem_os.h
	drivers/gpu/arm/mali/common/mali_kernel_memory_engine.c
	drivers/gpu/arm/mali/common/mali_kernel_memory_engine.h
	drivers/gpu/arm/mali/common/mali_kernel_vsync.c
	drivers/gpu/arm/mali/common/mali_mem_validation.h
	drivers/gpu/arm/mali/common/mali_memory.h
	drivers/gpu/arm/mali/common/mali_mmu.h
	drivers/gpu/arm/mali/common/mali_mmu_page_directory.h
	drivers/gpu/arm/mali/common/mali_osk_bitops.h
	drivers/gpu/arm/mali/common/mali_osk_list.h
	drivers/gpu/arm/mali/common/mali_scheduler.c
	drivers/gpu/arm/mali/common/mali_scheduler.h
	drivers/gpu/arm/mali/common/mali_session.c
	drivers/gpu/arm/mali/common/mali_session.h
	drivers/gpu/arm/mali/common/mali_user_settings_db.h
	drivers/gpu/arm/mali/include/linux/mali/mali_utgard_counters.h
	drivers/gpu/arm/mali/linux/license/gpl/mali_kernel_license.h
	drivers/gpu/arm/mali/linux/mali_kernel_sysfs.h
	drivers/gpu/arm/mali/linux/mali_linux_trace.h
	drivers/gpu/arm/mali/linux/mali_osk_atomics.c
	drivers/gpu/arm/mali/linux/mali_osk_math.c
	drivers/gpu/arm/mali/linux/mali_osk_memory.c
	drivers/gpu/arm/mali/linux/mali_osk_timers.c
	drivers/gpu/arm/mali/linux/mali_osk_wait_queue.c
	drivers/gpu/arm/mali/linux/mali_profiling_events.h
	drivers/gpu/arm/mali/linux/mali_profiling_internal.c
	drivers/gpu/arm/mali/linux/mali_profiling_internal.h
	drivers/gpu/arm/mali/linux/mali_uk_types.h
	drivers/gpu/arm/mali/linux/mali_ukk_gp.c
	drivers/gpu/arm/mali/linux/mali_ukk_profiling.c
	drivers/gpu/arm/mali/linux/mali_ukk_vsync.c
	drivers/gpu/arm/mali/regs/mali_200_regs.h
	drivers/gpu/arm/mali/regs/mali_gp_regs.h
	drivers/gpu/arm/mali/timestamp-arm11-cc/mali_timestamp.c
	drivers/gpu/arm/mali/timestamp-arm11-cc/mali_timestamp.h
	drivers/gpu/arm/mali/timestamp-default/mali_timestamp.c
	drivers/gpu/arm/mali/timestamp-default/mali_timestamp.h
	drivers/gpu/arm/ump/common/ump_kernel_descriptor_mapping.c
	drivers/gpu/arm/ump/common/ump_kernel_descriptor_mapping.h
	drivers/gpu/arm/ump/common/ump_ukk.h
	drivers/gpu/arm/ump/linux/ump_kernel_linux.h
	drivers/gpu/arm/ump/linux/ump_kernel_memory_backend_dedicated.h
	drivers/gpu/arm/ump/linux/ump_kernel_memory_backend_os.h
	drivers/gpu/arm/ump/linux/ump_osk_atomics.c
	drivers/gpu/arm/ump/linux/ump_osk_misc.c
	drivers/gpu/arm/ump/linux/ump_ukk_wrappers.c
	drivers/gpu/arm/ump/linux/ump_ukk_wrappers.h
	drivers/gpu/mali400/Kconfig
	drivers/gpu/mali400/r3p2/mali/common/mali_gp.h
	drivers/gpu/mali400/r3p2/mali/common/mali_gp_job.c
	drivers/gpu/mali400/r3p2/mali/common/mali_gp_job.h
	drivers/gpu/mali400/r3p2/mali/common/mali_hw_core.c
	drivers/gpu/mali400/r3p2/mali/common/mali_hw_core.h
	drivers/gpu/mali400/r3p2/mali/common/mali_kernel_descriptor_mapping.c
	drivers/gpu/mali400/r3p2/mali/common/mali_kernel_descriptor_mapping.h
	drivers/gpu/mali400/r3p2/mali/common/mali_kernel_vsync.c
	drivers/gpu/mali400/r3p2/mali/common/mali_mmu.h
	drivers/gpu/mali400/r3p2/mali/common/mali_mmu_page_directory.h
	drivers/gpu/mali400/r3p2/mali/common/mali_osk_bitops.h
	drivers/gpu/mali400/r3p2/mali/common/mali_user_settings_db.h
	drivers/gpu/mali400/r3p2/mali/include/linux/mali/mali_utgard_counters.h
	drivers/gpu/mali400/r3p2/mali/linux/license/gpl/mali_kernel_license.h
	drivers/gpu/mali400/r3p2/mali/linux/mali_linux_trace.h
	drivers/gpu/mali400/r3p2/mali/linux/mali_osk_memory.c
	drivers/gpu/mali400/r3p2/mali/linux/mali_profiling_internal.c
	drivers/gpu/mali400/r3p2/mali/linux/mali_profiling_internal.h
	drivers/gpu/mali400/r3p2/mali/linux/mali_ukk_profiling.c
	drivers/gpu/mali400/r3p2/mali/linux/mali_ukk_vsync.c
	drivers/gpu/mali400/r3p2/mali/regs/mali_200_regs.h
	drivers/gpu/mali400/r3p2/mali/regs/mali_gp_regs.h
	drivers/gpu/mali400/r3p2/mali/timestamp-arm11-cc/mali_timestamp.h
	drivers/gpu/mali400/r3p2/ump/common/ump_kernel_descriptor_mapping.c
	drivers/gpu/mali400/r3p2/ump/common/ump_kernel_descriptor_mapping.h
	drivers/gpu/mali400/r3p2/ump/common/ump_ukk.h
	drivers/gpu/mali400/r3p2/ump/include/ump_kernel_interface.h
	drivers/gpu/mali400/r3p2/ump/include/ump_kernel_platform.h
	drivers/gpu/mali400/r3p2/ump/linux/ump_ukk_wrappers.c
	drivers/gpu/mali400/r3p2/ump/linux/ump_ukk_wrappers.h
	drivers/gpu/mali400/r4p0/mali/Kbuild
	drivers/gpu/mali400/r4p0/mali/Kconfig
	drivers/gpu/mali400/r4p0/mali/MALI_CONFIGURATION
	drivers/gpu/mali400/r4p0/mali/Makefile
	drivers/gpu/mali400/r4p0/mali/common/mali_broadcast.c
	drivers/gpu/mali400/r4p0/mali/common/mali_broadcast.h
	drivers/gpu/mali400/r4p0/mali/common/mali_dlbu.c
	drivers/gpu/mali400/r4p0/mali/common/mali_dlbu.h
	drivers/gpu/mali400/r4p0/mali/common/mali_gp.c
	drivers/gpu/mali400/r4p0/mali/common/mali_gp.h
	drivers/gpu/mali400/r4p0/mali/common/mali_gp_job.c
	drivers/gpu/mali400/r4p0/mali/common/mali_gp_job.h
	drivers/gpu/mali400/r4p0/mali/common/mali_gp_scheduler.c
	drivers/gpu/mali400/r4p0/mali/common/mali_group.c
	drivers/gpu/mali400/r4p0/mali/common/mali_group.h
	drivers/gpu/mali400/r4p0/mali/common/mali_hw_core.c
	drivers/gpu/mali400/r4p0/mali/common/mali_hw_core.h
	drivers/gpu/mali400/r4p0/mali/common/mali_kernel_common.h
	drivers/gpu/mali400/r4p0/mali/common/mali_kernel_core.c
	drivers/gpu/mali400/r4p0/mali/common/mali_kernel_descriptor_mapping.c
	drivers/gpu/mali400/r4p0/mali/common/mali_kernel_descriptor_mapping.h
	drivers/gpu/mali400/r4p0/mali/common/mali_kernel_utilization.c
	drivers/gpu/mali400/r4p0/mali/common/mali_kernel_utilization.h
	drivers/gpu/mali400/r4p0/mali/common/mali_kernel_vsync.c
	drivers/gpu/mali400/r4p0/mali/common/mali_l2_cache.c
	drivers/gpu/mali400/r4p0/mali/common/mali_l2_cache.h
	drivers/gpu/mali400/r4p0/mali/common/mali_mmu.c
	drivers/gpu/mali400/r4p0/mali/common/mali_mmu.h
	drivers/gpu/mali400/r4p0/mali/common/mali_mmu_page_directory.c
	drivers/gpu/mali400/r4p0/mali/common/mali_mmu_page_directory.h
	drivers/gpu/mali400/r4p0/mali/common/mali_osk.h
	drivers/gpu/mali400/r4p0/mali/common/mali_osk_bitops.h
	drivers/gpu/mali400/r4p0/mali/common/mali_osk_profiling.h
	drivers/gpu/mali400/r4p0/mali/common/mali_pm.c
	drivers/gpu/mali400/r4p0/mali/common/mali_pm_domain.c
	drivers/gpu/mali400/r4p0/mali/common/mali_pm_domain.h
	drivers/gpu/mali400/r4p0/mali/common/mali_pmu.c
	drivers/gpu/mali400/r4p0/mali/common/mali_pmu.h
	drivers/gpu/mali400/r4p0/mali/common/mali_pp.c
	drivers/gpu/mali400/r4p0/mali/common/mali_pp.h
	drivers/gpu/mali400/r4p0/mali/common/mali_pp_job.h
	drivers/gpu/mali400/r4p0/mali/common/mali_ukk.h
	drivers/gpu/mali400/r4p0/mali/common/mali_user_settings_db.h
	drivers/gpu/mali400/r4p0/mali/include/linux/mali/mali_utgard.h
	drivers/gpu/mali400/r4p0/mali/include/linux/mali/mali_utgard_counters.h
	drivers/gpu/mali400/r4p0/mali/include/linux/mali/mali_utgard_ioctl.h
	drivers/gpu/mali400/r4p0/mali/include/linux/mali/mali_utgard_profiling_events.h
	drivers/gpu/mali400/r4p0/mali/include/linux/mali/mali_utgard_uk_types.h
	drivers/gpu/mali400/r4p0/mali/linux/license/gpl/mali_kernel_license.h
	drivers/gpu/mali400/r4p0/mali/linux/mali_kernel_linux.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_kernel_sysfs.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_linux_trace.h
	drivers/gpu/mali400/r4p0/mali/linux/mali_memory_dma_buf.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_osk_irq.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_osk_mali.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_osk_memory.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_osk_misc.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_osk_notification.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_osk_pm.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_osk_profiling.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_osk_time.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_pmu_power_up_down.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_profiling_internal.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_profiling_internal.h
	drivers/gpu/mali400/r4p0/mali/linux/mali_ukk_profiling.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_ukk_vsync.c
	drivers/gpu/mali400/r4p0/mali/linux/mali_ukk_wrappers.h
	drivers/gpu/mali400/r4p0/mali/platform/pegasus-m400/exynos4.c
	drivers/gpu/mali400/r4p0/mali/platform/pegasus-m400/exynos4_pmm.c
	drivers/gpu/mali400/r4p0/mali/platform/pegasus-m400/exynos4_pmm.h
	drivers/gpu/mali400/r4p0/mali/regs/mali_200_regs.h
	drivers/gpu/mali400/r4p0/mali/regs/mali_gp_regs.h
	drivers/gpu/mali400/r4p0/mali/timestamp-arm11-cc/mali_timestamp.h
	drivers/gpu/mali400/r4p0/ump/Kbuild
	drivers/gpu/mali400/r4p0/ump/Kconfig
	drivers/gpu/mali400/r4p0/ump/Makefile
	drivers/gpu/mali400/r4p0/ump/Makefile.common
	drivers/gpu/mali400/r4p0/ump/arch-pegasus-m400/config.h
	drivers/gpu/mali400/r4p0/ump/arch/arch-pegasus-m400
	drivers/gpu/mali400/r4p0/ump/common/ump_kernel_api.c
	drivers/gpu/mali400/r4p0/ump/common/ump_kernel_common.c
	drivers/gpu/mali400/r4p0/ump/common/ump_kernel_common.h
	drivers/gpu/mali400/r4p0/ump/common/ump_kernel_descriptor_mapping.c
	drivers/gpu/mali400/r4p0/ump/common/ump_kernel_descriptor_mapping.h
	drivers/gpu/mali400/r4p0/ump/common/ump_kernel_memory_backend.h
	drivers/gpu/mali400/r4p0/ump/common/ump_kernel_ref_drv.c
	drivers/gpu/mali400/r4p0/ump/common/ump_kernel_types.h
	drivers/gpu/mali400/r4p0/ump/common/ump_osk.h
	drivers/gpu/mali400/r4p0/ump/common/ump_ukk.h
	drivers/gpu/mali400/r4p0/ump/include/ump_kernel_interface.h
	drivers/gpu/mali400/r4p0/ump/include/ump_kernel_interface_ref_drv.h
	drivers/gpu/mali400/r4p0/ump/include/ump_kernel_platform.h
	drivers/gpu/mali400/r4p0/ump/include/ump_uk_types.h
	drivers/gpu/mali400/r4p0/ump/linux/ump_ioctl.h
	drivers/gpu/mali400/r4p0/ump/linux/ump_kernel_linux.c
	drivers/gpu/mali400/r4p0/ump/linux/ump_kernel_memory_backend_dedicated.c
	drivers/gpu/mali400/r4p0/ump/linux/ump_kernel_memory_backend_os.c
	drivers/gpu/mali400/r4p0/ump/linux/ump_memory_backend.c
	drivers/gpu/mali400/r4p0/ump/linux/ump_osk_low_level_mem.c
	drivers/gpu/mali400/r4p0/ump/linux/ump_ukk_wrappers.c
	drivers/gpu/mali400/r4p0/ump/linux/ump_ukk_wrappers.h
	include/ump/ump_kernel_interface.h
	include/ump/ump_kernel_platform.h