merge 'cm-10.1' into au-cm-10.1
Conflicts:
	arch/arm/mach-exynos/Kconfig
	arch/arm/mach-exynos/Kconfig.local
	arch/arm/mach-exynos/Kconfig.slp
	arch/arm/mach-exynos/Makefile
	arch/arm/mach-exynos/board-c1-modems.c
	arch/arm/mach-exynos/board-c1lgt-modems.c
	arch/arm/mach-exynos/board-c1vzw-modems.c
	arch/arm/mach-exynos/board-gps-bcm475x.c
	arch/arm/mach-exynos/board-m0-modems.c
	arch/arm/mach-exynos/board-m0ctc-modems.c
	arch/arm/mach-exynos/board-slp-pq.c
	arch/arm/mach-exynos/clock-exynos4.c
	arch/arm/mach-exynos/clock-exynos4212.c
	arch/arm/mach-exynos/clock-exynos5.c
	arch/arm/mach-exynos/cpu-exynos5.c
	arch/arm/mach-exynos/cpufreq-4x12.c
	arch/arm/mach-exynos/cpufreq-5250.c
	arch/arm/mach-exynos/cpufreq.c
	arch/arm/mach-exynos/cpuidle-exynos4.c
	arch/arm/mach-exynos/cpuidle-exynos5.c
	arch/arm/mach-exynos/include/mach/gpio-midas.h
	arch/arm/mach-exynos/include/mach/gpio-rev00-c1vzw.h
	arch/arm/mach-exynos/include/mach/gpio-u1.h
	arch/arm/mach-exynos/include/mach/map-exynos4.h
	arch/arm/mach-exynos/include/mach/sec_debug.h
	arch/arm/mach-exynos/mach-midas.c
	arch/arm/mach-exynos/mach-p10.c
	arch/arm/mach-exynos/mach-px.c
	arch/arm/mach-exynos/mach-u1.c
	arch/arm/mach-exynos/mdm2.c
	arch/arm/mach-exynos/mdm_common.c
	arch/arm/mach-exynos/mdm_device.c
	arch/arm/mach-exynos/midas-camera.c
	arch/arm/mach-exynos/midas-gpio.c
	arch/arm/mach-exynos/midas-lcd.c
	arch/arm/mach-exynos/midas-mhl.c
	arch/arm/mach-exynos/midas-nfc.c
	arch/arm/mach-exynos/midas-power.c
	arch/arm/mach-exynos/midas-sensor.c
	arch/arm/mach-exynos/midas-sound.c
	arch/arm/mach-exynos/midas-thermistor.c
	arch/arm/mach-exynos/midas-tsp.c
	arch/arm/mach-exynos/naples-gpio.c
	arch/arm/mach-exynos/naples-power.c
	arch/arm/mach-exynos/p4note-gpio.c
	arch/arm/mach-exynos/pm-exynos4.c
	arch/arm/mach-exynos/px-switch.c
	arch/arm/mach-exynos/sec-reboot.c
	arch/arm/mach-exynos/sec-switch.c
	arch/arm/mach-exynos/sec-switch_max8997.c
	arch/arm/mach-exynos/sec_debug.c
	arch/arm/mach-exynos/sec_thermistor.c
	arch/arm/mach-exynos/secmem-allocdev.c
	arch/arm/mach-exynos/setup-fb-s5p.c
	arch/arm/mach-exynos/setup-fimc0.c
	arch/arm/mach-exynos/setup-keypad.c
	arch/arm/mach-exynos/setup-mshci-gpio.c
	arch/arm/mach-exynos/setup-usb-phy.c
	arch/arm/mach-exynos/tmu.c
	arch/arm/mach-exynos/u1-gpio.c
	arch/arm/mach-exynos/u1-na-spr-panel.c
	arch/arm/mach-exynos/u1-wimax.c
	arch/arm/mach-exynos/u1-wlan.c
	arch/arm/plat-samsung/Kconfig
	arch/arm/plat-samsung/include/plat/fimd_lite_ext.h
	arch/arm/plat-samsung/pm.c
	arch/arm/tools/mach-types
	drivers/Makefile
	drivers/battery/battery-factory.c
	drivers/battery/max17047_fuelgauge.c
	drivers/battery/max77693_charger.c
	drivers/battery/samsung_battery.c
	drivers/cpufreq/Kconfig
	drivers/cpufreq/cpufreq_pegasusq.c
	drivers/gpu/Makefile
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/exynos/exynos_drm_drv.h
	drivers/gpu/drm/exynos/exynos_drm_fimd.c
	drivers/gpu/drm/exynos/exynos_drm_g2d.c
	drivers/gpu/drm/exynos/exynos_drm_gem.c
	drivers/gpu/drm/exynos/exynos_drm_iommu.c
	drivers/gpu/drm/exynos/exynos_drm_iommu.h
	drivers/gpu/drm/exynos/exynos_drm_rotator.c
	drivers/gpu/ion/exynos/exynos_ion.c
	drivers/input/keyboard/cypress/cypress-touchkey.c
	drivers/input/misc/Kconfig
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/input/touchscreen/melfas_ts.c
	drivers/input/touchscreen/mms_ts.c
	drivers/input/touchscreen/mms_ts_gc.c
	drivers/input/touchscreen/mxt1664s.c
	drivers/input/touchscreen/mxt1664s_dev.h
	drivers/input/touchscreen/mxt1664s_sec.c
	drivers/input/touchscreen/synaptics_fw.h
	drivers/input/touchscreen/synaptics_s7301.c
	drivers/input/touchscreen/synaptics_sysfs.c
	drivers/input/touchscreen/synaptics_sysfs.h
	drivers/input/touchscreen/wacom/wacom_i2c.c
	drivers/input/touchscreen/wacom/wacom_i2c_firm.c
	drivers/input/touchscreen/wacom/wacom_i2c_firm_p4.h
	drivers/input/touchscreen/wacom/wacom_i2c_flash.c
	drivers/input/touchscreen/wacom/wacom_i2c_func.c
	drivers/irda/Kconfig
	drivers/leds/leds-an30259a.c
	drivers/media/tdmb/tdmb.c
	drivers/media/video/Kconfig
	drivers/media/video/Makefile
	drivers/media/video/isx012.c
	drivers/media/video/isx012.h
	drivers/media/video/isx012_regs.h
	drivers/media/video/m5mo.c
	drivers/media/video/m9mo.c
	drivers/media/video/m9mo.h
	drivers/media/video/s5c73m3.c
	drivers/media/video/s5c73m3.h
	drivers/media/video/s5k5bbgx.c
	drivers/media/video/s5k5bbgx.h
	drivers/media/video/s5k5bbgx_setfile.h
	drivers/media/video/samsung/fimc/fimc_capture.c
	drivers/media/video/samsung/fimg2d3x-exynos4/fimg2d_dev.c
	drivers/media/video/samsung/fimg2d4x-exynos4/fimg2d.h
	drivers/media/video/samsung/fimg2d4x-exynos4/fimg2d_ctx.c
	drivers/media/video/samsung/fimg2d4x-exynos4/fimg2d_drv.c
	drivers/media/video/samsung/mali/Makefile
	drivers/media/video/samsung/mali/arch
	drivers/media/video/samsung/mali/common/mali_cluster.c
	drivers/media/video/samsung/mali/common/mali_gp_scheduler.c
	drivers/media/video/samsung/mali/common/mali_group.h
	drivers/media/video/samsung/mali/common/mali_kernel_MALI200.c
	drivers/media/video/samsung/mali/common/mali_kernel_rendercore.c
	drivers/media/video/samsung/mali/common/mali_mem_validation.c
	drivers/media/video/samsung/mali/common/mali_memory.c
	drivers/media/video/samsung/mali/common/mali_mmu.c
	drivers/media/video/samsung/mali/common/mali_mmu.h
	drivers/media/video/samsung/mali/common/mali_mmu_page_directory.c
	drivers/media/video/samsung/mali/common/mali_pm.c
	drivers/media/video/samsung/mali/common/mali_pp_job.h
	drivers/media/video/samsung/mali/common/mali_pp_scheduler.c
	drivers/media/video/samsung/mali/common/pmm/mali_pmm.c
	drivers/media/video/samsung/mali/linux/mali_kernel_pm.c
	drivers/media/video/samsung/mali/linux/mali_kernel_sysfs.c
	drivers/media/video/samsung/mali/linux/mali_osk_notification.c
	drivers/media/video/samsung/mali/linux/mali_osk_profiling_gator.c
	drivers/media/video/samsung/mali_r3p0/Makefile
	drivers/media/video/samsung/mali_r3p0/arch-pegasus-m400/config.h
	drivers/media/video/samsung/mali_r3p0/common/mali_block_allocator.c
	drivers/media/video/samsung/mali_r3p0/common/mali_kernel_common.h
	drivers/media/video/samsung/mali_r3p0/common/mali_kernel_core.c
	drivers/media/video/samsung/mali_r3p0/common/mali_kernel_descriptor_mapping.h
	drivers/media/video/samsung/mali_r3p0/common/mali_kernel_mem_os.h
	drivers/media/video/samsung/mali_r3p0/common/mali_kernel_vsync.c
	drivers/media/video/samsung/mali_r3p0/common/mali_osk.h
	drivers/media/video/samsung/mali_r3p0/common/mali_osk_bitops.h
	drivers/media/video/samsung/mali_r3p0/common/mali_ukk.h
	drivers/media/video/samsung/mali_r3p0/linux/mali_kernel_linux.c
	drivers/media/video/samsung/mali_r3p0/linux/mali_kernel_pm.c
	drivers/media/video/samsung/mali_r3p0/linux/mali_kernel_sysfs.c
	drivers/media/video/samsung/mali_r3p0/linux/mali_linux_pm.h
	drivers/media/video/samsung/mali_r3p0/linux/mali_linux_pm_testsuite.h
	drivers/media/video/samsung/mali_r3p0/linux/mali_linux_trace.h
	drivers/media/video/samsung/mali_r3p0/linux/mali_osk_irq.c
	drivers/media/video/samsung/mali_r3p0/linux/mali_osk_locks.c
	drivers/media/video/samsung/mali_r3p0/linux/mali_osk_low_level_mem.c
	drivers/media/video/samsung/mali_r3p0/linux/mali_osk_mali.c
	drivers/media/video/samsung/mali_r3p0/linux/mali_osk_specific.h
	drivers/media/video/samsung/mali_r3p0/linux/mali_slp_global_lock.c
	drivers/media/video/samsung/mali_r3p0/linux/mali_slp_global_lock.h
	drivers/media/video/samsung/mali_r3p0/linux/mali_ukk_core.c
	drivers/media/video/samsung/mali_r3p0/linux/mali_ukk_pp.c
	drivers/media/video/samsung/mali_r3p0/linux/mali_ukk_profiling.c
	drivers/media/video/samsung/mali_r3p0/linux/mali_ukk_wrappers.h
	drivers/media/video/samsung/mali_r3p0/platform/mali_platform.h
	drivers/media/video/samsung/mali_r3p0/platform/orion-m400/mali_platform.c
	drivers/media/video/samsung/mali_r3p0/platform/orion-m400/mali_platform_dvfs.c
	drivers/media/video/samsung/mali_r3p0/platform/pegasus-m400/mali_platform.c
	drivers/media/video/samsung/mali_r3p0/regs/mali_200_regs.h
	drivers/media/video/samsung/mali_r3p0/regs/mali_gp_regs.h
	drivers/media/video/samsung/ump/arch
	drivers/media/video/samsung/ump/common/ump_uk_types.h
	drivers/media/video/samsung/ump/linux/ump_kernel_memory_backend_os.c
	drivers/media/video/slp_s5c73m3.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/es305.c
	drivers/misc/fm34_we395.c
	drivers/misc/max77693-muic.c
	drivers/misc/max8893.c
	drivers/misc/max8997-muic.c
	drivers/misc/modem_if/Kconfig
	drivers/misc/modem_if/Makefile
	drivers/misc/modem_if/modem_link_device_dpram.c
	drivers/misc/modem_if/modem_link_device_dpram.h
	drivers/misc/modem_if/modem_link_device_hsic.c
	drivers/misc/modem_if/modem_link_device_usb.c
	drivers/misc/modem_if/modem_link_pm_usb.c
	drivers/misc/modem_if/modem_link_pm_usb.h
	drivers/misc/modem_if/modem_modemctl_device_cmc221.c
	drivers/misc/modem_if/modem_modemctl_device_mdm6600.c
	drivers/misc/modem_if/modem_prj.h
	drivers/misc/modem_if/modem_utils.c
	drivers/misc/modem_if/modem_utils.h
	drivers/misc/modem_if/modem_variation.h
	drivers/misc/modem_if/sipc4_io_device.c
	drivers/misc/modem_if/sipc4_modem.c
	drivers/misc/modem_if/sipc5_io_device.c
	drivers/misc/modem_if/sipc5_modem.c
	drivers/misc/sec_jack.c
	drivers/misc/usb3803.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sdio.c
	drivers/mmc/host/mshci.c
	drivers/mmc/host/sdhci.c
	drivers/net/Makefile
	drivers/net/usb/rmnet_usb_ctrl.c
	drivers/net/usb/rmnet_usb_ctrl.h
	drivers/net/wimax_cmc/Kconfig
	drivers/net/wimax_cmc/Makefile
	drivers/net/wimax_cmc/firmware.c
	drivers/net/wimax_cmc/firmware.h
	drivers/net/wimax_cmc/wimax_i2c.c
	drivers/net/wimax_cmc/wimax_i2c.h
	drivers/net/wimax_cmc/wimax_sdio.c
	drivers/net/wimax_cmc/wimax_sdio.h
	drivers/net/wireless/ath/ath6kl/c210.c
	drivers/net/wireless/ath/ath6kl/debug.c
	drivers/net/wireless/ath/ath6kl/debug.h
	drivers/net/wireless/ath/ath6kl/main.c
	drivers/net/wireless/ath/ath6kl/sdio.c
	drivers/net/wireless/ath/ath6kl/txrx.c
	drivers/net/wireless/ath/ath6kl/wmi.c
	drivers/net/wireless/ath/ath6kl/wmi.h
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/bcmsdh_linux.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_cdc.c
	drivers/net/wireless/bcmdhd/dhd_cfg80211.c
	drivers/net/wireless/bcmdhd/dhd_common.c
	drivers/net/wireless/bcmdhd/dhd_custom_sec.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/dhd_sec_feature.h
	drivers/net/wireless/bcmdhd/dhd_wlfc.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/include/sbchipc.h
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.h
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	drivers/net/wireless/bcmdhd/wl_iw.c
	drivers/net/wireless/bcmdhd/wl_iw.h
	drivers/net/wireless/bcmdhd/wldev_common.c
	drivers/power/max17042_fuelgauge_px.c
	drivers/power/sec_battery_px.c
	drivers/power/sec_battery_u1.c
	drivers/regulator/max77686.c
	drivers/rtc/rtc-max77686.c
	drivers/samsung/fm_si4709/Si4705_dev.c
	drivers/sensor/Makefile
	drivers/sensor/gp2a_proximity.c
	drivers/staging/android/lowmemorykiller.c
	drivers/staging/westbridge/astoria/Makefile
	drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c
	drivers/staging/westbridge/astoria/api/src/cyasmisc.c
	drivers/staging/westbridge/astoria/api/src/cyasstorage.c
	drivers/staging/westbridge/astoria/arch/arm/mach-c110/cyashalc110_pnand.c
	drivers/staging/westbridge/astoria/arch/arm/plat-c110/include/mach/westbridge/cyashaldef.h
	drivers/staging/westbridge/astoria/arch/arm/plat-c110/include/mach/westbridge/westbridge-c110-pnand-hal/cyasc110dev_pnand.h
	drivers/staging/westbridge/astoria/arch/arm/plat-c110/include/mach/westbridge/westbridge-c110-pnand-hal/cyashalc110_pnand.h
	drivers/staging/westbridge/astoria/arch/arm/plat-c110/include/mach/westbridge/westbridge-c110-pnand-hal/cyasmemmap.h
	drivers/staging/westbridge/astoria/device/Makefile
	drivers/staging/westbridge/astoria/device/cyandevice_export.h
	drivers/staging/westbridge/astoria/device/cyasdiagnostics.c
	drivers/staging/westbridge/astoria/device/cyasdiagnostics.h
	drivers/staging/westbridge/astoria/device/firmware/cyanfw_mtp_sd_mmc_rel_csp_silicon.h
	drivers/staging/westbridge/astoria/device/firmware/cyanfw_mtp_sd_mmc_rel_silicon.h
	drivers/staging/westbridge/astoria/device/firmware/cyanfw_sd_mmc_rel_csp_silicon.h
	drivers/staging/westbridge/astoria/device/firmware/cyanfw_sd_mmc_rel_silicon.h
	drivers/staging/westbridge/astoria/device/firmware/cyastfw_mtp_sd_mmc_rel_silicon.h
	drivers/staging/westbridge/astoria/device/firmware/cyastfw_sd_mmc_rel_silicon.h
	drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h
	drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h
	drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h
	drivers/staging/westbridge/astoria/switch/Kconfig
	drivers/staging/westbridge/astoria/switch/Makefile
	drivers/staging/westbridge/astoria/switch/cyasswitch.c
	drivers/tty/serial/samsung.c
	drivers/usb/core/hub.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/f_mtp_samsung.c
	drivers/usb/gadget/f_mtp_slp.c
	drivers/usb/gadget/s3c_udc_otg.c
	drivers/usb/gadget/storage_common.c
	drivers/usb/host/ehci-hcd.c
	drivers/usb/host/ehci-s5p.c
	drivers/usb/serial/qcserial.c
	drivers/video/Kconfig
	drivers/video/backlight/Kconfig
	drivers/video/backlight/Makefile
	drivers/video/backlight/s6e8aa0.c
	drivers/video/samsung/Kconfig
	drivers/video/samsung/Makefile
	drivers/video/samsung/lcdfreq.c
	drivers/video/samsung/mdnie.c
	drivers/video/samsung/mdnie.h
	drivers/video/samsung/mdnie_table_gc1.h
	drivers/video/samsung/mdnie_table_p4note.h
	drivers/video/samsung/s3cfb.h
	drivers/video/samsung/s3cfb_main.c
	drivers/video/samsung/s3cfb_s6e39a0.c
	drivers/video/samsung/s3cfb_s6e8aa0.c
	drivers/video/samsung/s3cfb_s6e8ab0.c
	drivers/video/samsung/s5p-dsim.c
	drivers/video/samsung/s5p-dsim.h
	drivers/video/samsung/s6d6aa1.c
	drivers/video/samsung/s6dr171.c
	firmware/Makefile
	firmware/SlimISP_GD.bin.ihex
	firmware/SlimISP_ZD.bin.ihex
	firmware/tsp_melfas/PRIV.fw.ihex
	firmware/tsp_melfas/PUBL.fw.ihex
	include/compat/linux/nl80211.h
	include/compat/net/cfg80211.h
	include/drm/exynos_drm.h
	include/linux/battery/samsung_battery.h
	include/linux/i2c/fm34_we395.h
	include/linux/i2c/touchkey_i2c.h
	include/linux/input.h
	include/linux/mfd/max8997.h
	include/linux/platform_data/modem.h
	include/linux/power/sec_battery_px.h
	include/linux/videodev2_exynos_camera.h
	include/linux/wacom_i2c.h
	include/linux/wimax/samsung/wimax732.h
	net/bluetooth_mgmt/hci_core.c
	net/wireless_ath/nl80211.c
	sound/soc/codecs/mc1n2/mc1n2_cfg_SPR.h
	sound/soc/codecs/wm8994.c
	sound/soc/samsung/Kconfig
	sound/soc/samsung/Makefile
	sound/soc/samsung/audss.c
	sound/soc/samsung/midas_wm1811.c
	sound/soc/samsung/slp_midas_wm1811.c