Merge omapzoom commit 'abf9aaf60d96bb25036590169b910f52548c5eb0' into cm-10.2

Conflicts:
	arch/arm/mach-omap2/sleep44xx.S
	drivers/gpu/pvr/bridged_pvr_bridge.c
	drivers/gpu/pvr/devicemem.c
	drivers/gpu/pvr/ion.c
	drivers/gpu/pvr/ion.h
	drivers/gpu/pvr/mm.c
	drivers/gpu/pvr/omap4/syslocal.h
	drivers/gpu/pvr/pdump_km.h
	drivers/gpu/pvr/pvr_bridge.h
	drivers/gpu/pvr/pvr_bridge_k.c
	drivers/gpu/pvr/pvr_uaccess.h
	drivers/gpu/pvr/pvrversion.h
	drivers/gpu/pvr/queue.c
	drivers/gpu/pvr/refcount.h
	drivers/gpu/pvr/servicesint.h
	drivers/gpu/pvr/sgx/bridged_sgx_bridge.c
	drivers/gpu/pvr/sgx/sgxinit.c
	drivers/gpu/pvr/sgx/sgxpower.c
	drivers/gpu/pvr/sgx/sgxreset.c
	drivers/gpu/pvr/sgx/sgxutils.c
	drivers/gpu/pvr/sgx/sgxutils.h
	drivers/gpu/pvr/sgx_bridge.h
	drivers/gpu/pvr/sgxerrata.h
	drivers/gpu/pvr/sgxfeaturedefs.h
	drivers/input/evdev.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/tty/serial/omap-serial.c
	drivers/usb/gadget/android.c
	drivers/video/hdmi_ti_4xxx_ip.c
	drivers/video/hdmi_ti_4xxx_ip.h
	drivers/video/omap2/dss/dispc.c
	drivers/video/omap2/dss/manager.c
	drivers/video/omap2/omaplfb/omaplfb_displayclass.c

Change-Id: I71ae6d7245f26a5f9242834162d319bbb84bfa34