Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_kernel_samsung_d2 into jellybean3

Conflicts:
	arch/arm/configs/cyanogen_apexq_defconfig
	arch/arm/configs/m2selinux_defconfig
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/acpuclock-8960.c
	arch/arm/mach-msm/acpuclock-krait.c
	arch/arm/mach-msm/board-8960-regulator.c
	arch/arm/mach-msm/board-apexq-battery.c
	arch/arm/mach-msm/board-apexq-camera.c
	arch/arm/mach-msm/board-apexq.c
	arch/arm/mach-msm/board-m2-display.c
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/include/mach/board.h
	drivers/battery/sec_battery.c
	drivers/input/keyboard/cypress_touchkey_236/Kconfig
	drivers/input/keyboard/cypress_touchkey_236/cypress-touchkey-236.c
	drivers/input/keyboard/cypress_touchkey_236/cypress_tkey_fw.h
	drivers/input/keyboard/cypress_touchkey_236/issp_driver_routines.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/iommu/msm_iommu.c
	drivers/misc/sec_jack.c
	drivers/motor/tspdrv.c
	drivers/usb/Kconfig
	drivers/usb/Makefile
	drivers/usb/otg/Kconfig
	drivers/usb/otg/msm_otg.c
	drivers/video/msm/Kconfig
	drivers/video/msm/Makefile
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/mipi_samsung_oled.c
	firmware/Makefile
	include/linux/usb/msm_hsusb.h
	include/linux/yas.h
	include/net/bluetooth/hci_core.h
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hidp/core.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/sco.c

'Merge'