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

Conflicts:
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/board-8930-camera.c
	arch/arm/mach-msm/clock-8960.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/hwmon/pm8xxx-adc.c
	drivers/input/keyboard/cypress_touchkey_236/cypress-touchkey-236.c
	drivers/media/dvb/dvb-core/dmxdev.c
	drivers/media/dvb/dvb-core/dvb_demux.c
	drivers/media/radio/radio-iris.c
	drivers/media/radio/radio-tavarua.c
	drivers/media/video/msm/msm_isp.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/mfd/wcd9xxx-irq.c
	drivers/misc/a2220.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/power/max17040_battery.c
	drivers/power/sec_battery.c
	drivers/usb/gadget/u_data_hsic.c
	drivers/video/msm/mdp4_overlay_lcdc.c
	drivers/video/msm/mipi_samsung_oled_video_hd_pt.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb.h
	include/linux/diagchar.h
	include/linux/msm_thermal.h
	mm/page_alloc.c

'Merge'