Hand merge "update mali drivers"

Conflicts:
	drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/linux/mali_kernel_linux.c
	drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/platform/ux500/mali_platform.c

	modified:   drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/Kbuild
	modified:   drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/linux/mali_kernel_linux.c
	modified:   drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/platform/ux500/mali_platform.c
	modified:   drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/Kbuild
	modified:   drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/Makefile.common
This is not needed