Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_kernel_samsung_d2 into jellybean2

Conflicts:
	arch/arm/mach-msm/board-8064-pmic.c
	arch/arm/mach-msm/board-8064-storage.c
	arch/arm/mach-msm/board-8930-pmic.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8960-pmic.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/iommu_domains.c
	arch/arm/mach-msm/msm_bus/msm_bus_arb.c
	arch/arm/mm/dma-mapping.c
	arch/arm/mm/flush.c
	drivers/char/msm_rotator.c
	drivers/gpu/msm/kgsl_sync.c
	drivers/gpu/msm/kgsl_sync.h
	drivers/input/touchscreen/synaptics_fw_update.c
	drivers/input/touchscreen/synaptics_i2c_rmi4.c
	drivers/input/touchscreen/synaptics_i2c_rmi4.h
	drivers/media/video/msm/gemini/msm_gemini_hw.c
	drivers/media/video/msm/gemini/msm_gemini_hw.h
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/power/pm8921-bms.c
	drivers/usb/gadget/f_adb.c
	drivers/usb/gadget/f_rmnet.c
	drivers/video/fbcmap.c
	drivers/video/msm/msm_fb.c
	include/linux/diagchar.h
	include/linux/mfd/pm8xxx/pm8921-bms.h
	include/linux/sync.h
	include/media/msm_camera.h
	sound/soc/msm/qdsp6/q6voice.c

'Merge'