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

Conflicts:
	Documentation/cpu-freq/governors.txt
	Makefile
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/mach-msm/board-8064-camera.c
	arch/arm/mach-msm/board-8064-gpiomux.c
	arch/arm/mach-msm/board-8064-pmic.c
	arch/arm/mach-msm/board-8064-regulator.c
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/board-8930-display.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8960-camera.c
	arch/arm/mach-msm/board-8960-display.c
	arch/arm/mach-msm/board-8960-regulator.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-8064.c
	arch/arm/mach-msm/include/mach/mdm2.h
	arch/arm/mach-msm/mdm2.c
	arch/arm/mach-msm/msm_rq_stats.c
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
	arch/arm/mach-msm/qdsp6v2/audio_utils_aio.h
	arch/arm/mach-msm/qdsp6v2/q6audio_v1_aio.c
	arch/powerpc/kernel/cputable.c
	arch/powerpc/mm/hash_utils_64.c
	arch/s390/include/asm/tlbflush.h
	arch/s390/kernel/entry.S
	arch/s390/kernel/entry64.S
	arch/x86/kernel/cpu/perf_event_intel_ds.c
	arch/x86/power/cpu.c
	drivers/base/sync.c
	drivers/block/loop.c
	drivers/char/hw_random/virtio-rng.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/crypto/msm/qce50.c
	drivers/crypto/msm/qcedev.c
	drivers/crypto/msm/qcrypto.c
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c
	drivers/hwmon/lineage-pem.c
	drivers/hwmon/pmbus/ltc2978.c
	drivers/hwmon/sht15.c
	drivers/i2c/busses/i2c-qup.c
	drivers/media/dvb/dvb-core/dvb_demux.c
	drivers/media/dvb/dvb-core/dvb_demux.h
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.c
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.h
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_tsif.c
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_tspp_v1.c
	drivers/media/dvb/mpq/demux/mpq_sdmx.h
	drivers/media/radio/radio-iris.c
	drivers/media/radio/radio-tavarua.c
	drivers/media/video/msm/Kconfig
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm/sensors/Makefile
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/media/video/msm/sensors/msm_sensor.h
	drivers/media/video/msm/sensors/msm_sensor_common.h
	drivers/media/video/msm/sensors/mt9e013_v4l2.c
	drivers/media/video/msm/sensors/ov2720.c
	drivers/media/video/msm/sensors/ov5647_v4l2.c
	drivers/media/video/msm/sensors/ov8825_v4l2.c
	drivers/media/video/msm/sensors/s5k4e1_v4l2.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/media/video/msm_wfd/enc-mfc-subdev.c
	drivers/media/video/msm_wfd/wfd-ioctl.c
	drivers/media/video/msm_zsl/sensors/msm_sensor.h
	drivers/mfd/marimba-core.c
	drivers/misc/qseecom.c
	drivers/mmc/card/block.c
	drivers/mmc/card/queue.c
	drivers/mmc/card/queue.h
	drivers/mmc/host/msm_sdcc.c
	drivers/mmc/host/msm_sdcc.h
	drivers/net/macvlan.c
	drivers/net/tun.c
	drivers/net/usb/rmnet_usb_data.c
	drivers/net/wireless/wcnss/wcnss_riva.c
	drivers/net/wireless/wcnss/wcnss_wlan.c
	drivers/power/pm8921-charger.c
	drivers/spi/spi_qsd.c
	drivers/spi/spi_qsd.h
	drivers/staging/vt6656/main_usb.c
	drivers/tty/pty.c
	drivers/tty/serial/8250/8250_pci.c
	drivers/tty/serial/Kconfig
	drivers/tty/serial/msm_serial_hs.c
	drivers/usb/class/cdc-wdm.c
	drivers/usb/gadget/f_audio_source.c
	drivers/usb/gadget/u_serial.c
	drivers/usb/host/ehci-msm-hsic.c
	drivers/usb/host/ehci-q.c
	drivers/usb/serial/cp210x.c
	drivers/usb/serial/csvt.c
	drivers/usb/serial/option.c
	drivers/usb/serial/qcaux.c
	drivers/usb/storage/initializers.c
	drivers/usb/storage/initializers.h
	drivers/usb/storage/unusual_devs.h
	drivers/video/atmel_lcdfb.c
	drivers/video/msm/external_common.c
	drivers/video/msm/external_common.h
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/msm_dss_io_8960.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.c
	drivers/w1/w1.c
	drivers/xen/xen-pciback/pciback_ops.c
	fs/block_dev.c
	fs/btrfs/volumes.c
	fs/ext3/super.c
	include/linux/ieee80211.h
	include/linux/nl80211.h
	include/linux/perf_event.h
	include/linux/rq_stats.h
	include/linux/wcnss_wlan.h
	include/media/msm_camera.h
	include/media/tavarua.h
	include/net/bluetooth/hci.h
	include/net/bluetooth/smp.h
	include/net/cfg80211.h
	include/sound/q6asm.h
	include/video/atmel_lcdc.h
	kernel/signal.c
	net/bluetooth/hci_event.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/smp.c
	net/core/dev.c
	net/core/rtnetlink.c
	net/dcb/dcbnl.c
	net/ieee802154/6lowpan.h
	net/ipv4/tcp_input.c
	net/ipv6/ip6_input.c
	net/ipv6/route.c
	net/l2tp/l2tp_ppp.c
	net/mac80211/cfg.c
	net/mac80211/ieee80211_i.h
	net/mac80211/main.c
	net/mac80211/mlme.c
	net/mac80211/util.c
	net/netlabel/netlabel_unlabeled.c
	net/rds/message.c
	net/wireless/nl80211.c
	security/selinux/xfrm.c
	sound/core/seq/seq_timer.c
	sound/soc/codecs/wcd9310.c
	sound/soc/msm/apq8064.c
	sound/soc/msm/msm-compr-q6.c
	sound/soc/msm/msm-dai-fe.c
	sound/soc/msm/msm-pcm-routing.c
	sound/soc/msm/msm-pcm-routing.h
	sound/soc/msm/msm-pcm-voice.c
	sound/soc/msm/msm-pcm-voice.h
	sound/soc/msm/msm8930.c
	sound/soc/msm/msm8960-d2.c
	sound/soc/msm/msm8960.c
	sound/soc/msm/qdsp6/q6adm.c
	sound/soc/msm/qdsp6/q6asm.c
	sound/soc/msm/qdsp6/q6voice.c
	sound/soc/msm/qdsp6/q6voice.h
	sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c

'Updating'