smdk4210: apply samsung jb update

Change-Id: I432d50bc06b658569728e10012dc3c1a400b25b5

Conflicts:
	Documentation/cpu-freq/governors.txt
	Makefile
	arch/Kconfig
	arch/alpha/include/asm/futex.h
	arch/arm/Makefile
	arch/arm/boot/compressed/Makefile
	arch/arm/configs/cyanogenmod_i777_defconfig
	arch/arm/configs/cyanogenmod_i815_defconfig
	arch/arm/configs/cyanogenmod_i9100_defconfig
	arch/arm/configs/u1_defconfig
	arch/arm/kernel/smp.c
	arch/arm/mach-exynos/Kconfig
	arch/arm/mach-exynos/Kconfig.local
	arch/arm/mach-exynos/baffin-gpio.c
	arch/arm/mach-exynos/baffin-power.c
	arch/arm/mach-exynos/board-c1-modems.c
	arch/arm/mach-exynos/board-c1lgt-modems.c
	arch/arm/mach-exynos/board-m0-modems.c
	arch/arm/mach-exynos/board-m0-td-modems.c
	arch/arm/mach-exynos/board-m0ctc-modems.c
	arch/arm/mach-exynos/board-trats.c
	arch/arm/mach-exynos/busfreq_opp_4x12.c
	arch/arm/mach-exynos/clock-exynos4212.c
	arch/arm/mach-exynos/cpufreq-4x12.c
	arch/arm/mach-exynos/cpuidle-exynos4.c
	arch/arm/mach-exynos/cyttsp4_img.h
	arch/arm/mach-exynos/cyttsp4_params.h
	arch/arm/mach-exynos/gc1-gpio.c
	arch/arm/mach-exynos/gc1-power.c
	arch/arm/mach-exynos/include/mach/gpio-rev00-baffin.h
	arch/arm/mach-exynos/include/mach/gpio-rev00-gc1.h
	arch/arm/mach-exynos/include/mach/gpio-rev00-m3.h
	arch/arm/mach-exynos/include/mach/gpio-rev00-t0.h
	arch/arm/mach-exynos/include/mach/mdm2.h
	arch/arm/mach-exynos/include/mach/sromc-exynos4.h
	arch/arm/mach-exynos/m3-gpio.c
	arch/arm/mach-exynos/mach-midas.c
	arch/arm/mach-exynos/mach-p4notepq.c
	arch/arm/mach-exynos/mach-px.c
	arch/arm/mach-exynos/mdm_common.c
	arch/arm/mach-exynos/mdm_device.c
	arch/arm/mach-exynos/mdm_hsic_pm.c
	arch/arm/mach-exynos/mdm_private.h
	arch/arm/mach-exynos/midas-camera.c
	arch/arm/mach-exynos/midas-lcd.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/p4-input.c
	arch/arm/mach-exynos/pm-exynos4.c
	arch/arm/mach-exynos/sec-reboot.c
	arch/arm/mach-exynos/sec-switch.c
	arch/arm/mach-exynos/sec_thermistor.c
	arch/arm/mach-exynos/secmem-allocdev.c
	arch/arm/mach-exynos/setup-sdhci-gpio.c
	arch/arm/mach-exynos/setup-sdhci.c
	arch/arm/mach-exynos/setup-usb-phy.c
	arch/arm/mach-exynos/stand-hotplug.c
	arch/arm/mach-exynos/t0-gpio.c
	arch/arm/mach-exynos/t0-sound.c
	arch/arm/mm/dma-mapping-cma.c
	arch/arm/mm/init-cma.c
	arch/arm/mm/mmu-cma.c
	arch/arm/plat-s5p/reserve_mem.c
	arch/arm/tools/mach-types
	arch/arm/vfp/vfpmodule.c
	drivers/Kconfig
	drivers/Makefile
	drivers/accessory/30pin_con.c
	drivers/barcode_emul/Kconfig
	drivers/barcode_emul/Makefile
	drivers/base/power/main.c
	drivers/battery/max17047_fuelgauge.c
	drivers/battery/max77693_charger.c
	drivers/battery/samsung_battery.c
	drivers/char/diag/diagchar_core.c
	drivers/char/exynos_mem.c
	drivers/char/mem.c
	drivers/cpufreq/cpufreq_conservative.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/cpufreq/cpufreq_pegasusq.c
	drivers/felica/felica.c
	drivers/felica/felica.h
	drivers/gpu/drm/exynos/exynos_drm_g2d.c
	drivers/gpu/drm/exynos/exynos_drm_gem.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/i2c/busses/i2c-s3c2410.c
	drivers/input/keyboard/gpio_keys.c
	drivers/input/touchscreen/Makefile
	drivers/input/touchscreen/cyttsp4_core.c
	drivers/input/touchscreen/cyttsp4_core.h
	drivers/input/touchscreen/cyttsp4_i2c.c
	drivers/input/touchscreen/mms152_ts.c
	drivers/input/touchscreen/mms_ts.c
	drivers/input/touchscreen/mxt224_u1.c
	drivers/input/touchscreen/mxt540s.c
	drivers/input/touchscreen/mxt540s_dev.h
	drivers/input/touchscreen/mxt540s_sec.c
	drivers/input/touchscreen/wacom/wacom_i2c.c
	drivers/input/touchscreen/wacom/wacom_i2c_coord_table.h
	drivers/input/touchscreen/wacom/wacom_i2c_coord_tables.h
	drivers/input/touchscreen/wacom/wacom_i2c_firm.c
	drivers/input/touchscreen/wacom/wacom_i2c_flash.c
	drivers/input/touchscreen/wacom/wacom_i2c_func.c
	drivers/input/touchscreen/wacom/wacom_i2c_func.h
	drivers/irda/ir_remote_con_mc96.c
	drivers/irda/irda_fw.h
	drivers/leds/leds-an30259a.c
	drivers/media/isdbt/Kconfig
	drivers/media/isdbt/fc8150/fc8150.c
	drivers/media/isdbt/fc8150/fc8150_bb.c
	drivers/media/isdbt/fc8150/fc8150_tun.c
	drivers/media/isdbt/fc8150/fci_i2c.c
	drivers/media/tdmb/tdmb.c
	drivers/media/video/exynos/fimc-lite/fimc-lite-core.c
	drivers/media/video/isx012.c
	drivers/media/video/isx012_regs.h
	drivers/media/video/m9mo.c
	drivers/media/video/m9mo.h
	drivers/media/video/s5c73m3.c
	drivers/media/video/s5c73m3.h
	drivers/media/video/s5k5bafx-v2.h
	drivers/media/video/samsung/Kconfig
	drivers/media/video/samsung/Makefile
	drivers/media/video/samsung/fimc/fimc_capture.c
	drivers/media/video/samsung/fimc/fimc_dev_u1.c
	drivers/media/video/samsung/fimg2d4x-exynos4/fimg2d.h
	drivers/media/video/samsung/fimg2d4x-exynos4/fimg2d4x_blt.c
	drivers/media/video/samsung/fimg2d4x-exynos4/fimg2d4x_hw.c
	drivers/media/video/samsung/fimg2d4x-exynos4/fimg2d_cache.c
	drivers/media/video/samsung/fimg2d4x-exynos4/fimg2d_cache.h
	drivers/media/video/samsung/fimg2d4x-exynos4/fimg2d_ctx.c
	drivers/media/video/samsung/fimg2d4x-exynos4/fimg2d_drv.c
	drivers/media/video/samsung/jpeg_v2x/jpeg_conf.h
	drivers/media/video/samsung/jpeg_v2x/jpeg_core.h
	drivers/media/video/samsung/jpeg_v2x/jpeg_dev.c
	drivers/media/video/samsung/jpeg_v2x/jpeg_mem.h
	drivers/media/video/samsung/jpeg_v2x/jpeg_regs.c
	drivers/media/video/samsung/jpeg_v2x/jpeg_regs.h
	drivers/media/video/samsung/mali/common/mali_kernel_gp.h
	drivers/media/video/samsung/mali/common/mali_kernel_l2_cache.c
	drivers/media/video/samsung/mali/common/mali_kernel_l2_cache.h
	drivers/media/video/samsung/mali/common/mali_kernel_mem.h
	drivers/media/video/samsung/mali/common/mali_kernel_mem_buddy.c
	drivers/media/video/samsung/mali/common/mali_kernel_mem_mmu.h
	drivers/media/video/samsung/mali/common/mali_kernel_pp.h
	drivers/media/video/samsung/mali/common/mali_kernel_session_manager.h
	drivers/media/video/samsung/mali/common/mali_kernel_subsystem.h
	drivers/media/video/samsung/mali/linux/mali_device_pause_resume.c
	drivers/media/video/samsung/mali/linux/mali_device_pause_resume.h
	drivers/media/video/samsung/mali_r3p0_lsi/arch-orion-m400/config.h
	drivers/media/video/samsung/mali_r3p0_lsi/common/mali_block_allocator.c
	drivers/media/video/samsung/mali_r3p0_lsi/common/mali_kernel_common.h
	drivers/media/video/samsung/mali_r3p0_lsi/common/mali_kernel_utilization.h
	drivers/media/video/samsung/mali_r3p0_lsi/common/mali_kernel_vsync.c
	drivers/media/video/samsung/mali_r3p0_lsi/common/mali_osk_mali.h
	drivers/media/video/samsung/mali_r3p0_lsi/include/linux/mali/mali_utgard_counters.h
	drivers/media/video/samsung/mali_r3p0_lsi/linux/license/gpl/mali_kernel_license.h
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_kernel_linux.h
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_kernel_pm.h
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_linux_pm.h
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_osk_atomics.c
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_osk_irq.c
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_osk_math.c
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_osk_misc.c
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_osk_profiling_internal.c
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_osk_time.c
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_osk_timers.c
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_ukk_mem.c
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_ukk_vsync.c
	drivers/media/video/samsung/mali_r3p0_lsi/regs/mali_200_regs.h
	drivers/media/video/samsung/mfc5x/mfc_dev.c
	drivers/media/video/samsung/mfc5x/mfc_mem.c
	drivers/media/video/samsung/tvout/s5p_tvout_v4l2.c
	drivers/misc/Kconfig
	drivers/misc/fm34_we395.c
	drivers/misc/max77693-muic.c
	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_dpram_ext_op.c
	drivers/misc/modem_if/modem_link_device_hsic.c
	drivers/misc/modem_if/modem_link_device_memory.h
	drivers/misc/modem_if/modem_link_device_spi.c
	drivers/misc/modem_if/modem_link_device_usb.c
	drivers/misc/modem_if/modem_link_pm_usb.c
	drivers/misc/modem_if/modem_modemctl_device_sprd8803.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/sipc5_io_device.c
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/mmc/core/mmc.c
	drivers/mmc/host/mshci.c
	drivers/mmc/host/sdhci-s3c.c
	drivers/mmc/host/sdhci.c
	drivers/mmc/host/sdhci.h
	drivers/motor/max77693_haptic.c
	drivers/net/usb/rmnet_usb_ctrl.c
	drivers/net/usb/usbnet.c
	drivers/net/wimax_cmc/wimax_sdio.c
	drivers/net/wireless/Makefile
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/aiutils.c
	drivers/net/wireless/bcmdhd/bcmevent.c
	drivers/net/wireless/bcmdhd/bcmsdh.c
	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/bcmutils.c
	drivers/net/wireless/bcmdhd/bcmwifi_channels.c
	drivers/net/wireless/bcmdhd/bcmwifi_channels.h
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_bta.c
	drivers/net/wireless/bcmdhd/dhd_bta.h
	drivers/net/wireless/bcmdhd/dhd_bus.h
	drivers/net/wireless/bcmdhd/dhd_cdc.c
	drivers/net/wireless/bcmdhd/dhd_cfg80211.c
	drivers/net/wireless/bcmdhd/dhd_cfg80211.h
	drivers/net/wireless/bcmdhd/dhd_common.c
	drivers/net/wireless/bcmdhd/dhd_custom_gpio.c
	drivers/net/wireless/bcmdhd/dhd_custom_sec.c
	drivers/net/wireless/bcmdhd/dhd_dbg.h
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_linux_sched.c
	drivers/net/wireless/bcmdhd/dhd_proto.h
	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/dngl_stats.h
	drivers/net/wireless/bcmdhd/dngl_wlhdr.h
	drivers/net/wireless/bcmdhd/hndpmu.c
	drivers/net/wireless/bcmdhd/include/Makefile
	drivers/net/wireless/bcmdhd/include/aidmp.h
	drivers/net/wireless/bcmdhd/include/bcm_cfg.h
	drivers/net/wireless/bcmdhd/include/bcm_mpool_pub.h
	drivers/net/wireless/bcmdhd/include/bcmcdc.h
	drivers/net/wireless/bcmdhd/include/bcmdefs.h
	drivers/net/wireless/bcmdhd/include/bcmendian.h
	drivers/net/wireless/bcmdhd/include/bcmnvram.h
	drivers/net/wireless/bcmdhd/include/bcmpcispi.h
	drivers/net/wireless/bcmdhd/include/bcmperf.h
	drivers/net/wireless/bcmdhd/include/bcmsdbus.h
	drivers/net/wireless/bcmdhd/include/bcmsdh.h
	drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h
	drivers/net/wireless/bcmdhd/include/bcmsdpcm.h
	drivers/net/wireless/bcmdhd/include/bcmsdspi.h
	drivers/net/wireless/bcmdhd/include/bcmsdstd.h
	drivers/net/wireless/bcmdhd/include/bcmspi.h
	drivers/net/wireless/bcmdhd/include/bcmutils.h
	drivers/net/wireless/bcmdhd/include/dhdioctl.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/include/hndpmu.h
	drivers/net/wireless/bcmdhd/include/hndrte_armtrap.h
	drivers/net/wireless/bcmdhd/include/hndrte_cons.h
	drivers/net/wireless/bcmdhd/include/hndsoc.h
	drivers/net/wireless/bcmdhd/include/linux_osl.h
	drivers/net/wireless/bcmdhd/include/linuxver.h
	drivers/net/wireless/bcmdhd/include/miniopt.h
	drivers/net/wireless/bcmdhd/include/msgtrace.h
	drivers/net/wireless/bcmdhd/include/osl.h
	drivers/net/wireless/bcmdhd/include/packed_section_end.h
	drivers/net/wireless/bcmdhd/include/packed_section_start.h
	drivers/net/wireless/bcmdhd/include/pcicfg.h
	drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h
	drivers/net/wireless/bcmdhd/include/proto/802.11e.h
	drivers/net/wireless/bcmdhd/include/proto/802.1d.h
	drivers/net/wireless/bcmdhd/include/proto/bcmeth.h
	drivers/net/wireless/bcmdhd/include/proto/bcmevent.h
	drivers/net/wireless/bcmdhd/include/proto/bcmip.h
	drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h
	drivers/net/wireless/bcmdhd/include/proto/eapol.h
	drivers/net/wireless/bcmdhd/include/proto/ethernet.h
	drivers/net/wireless/bcmdhd/include/proto/p2p.h
	drivers/net/wireless/bcmdhd/include/proto/sdspi.h
	drivers/net/wireless/bcmdhd/include/proto/vlan.h
	drivers/net/wireless/bcmdhd/include/proto/wpa.h
	drivers/net/wireless/bcmdhd/include/proto/wps.h
	drivers/net/wireless/bcmdhd/include/sbchipc.h
	drivers/net/wireless/bcmdhd/include/sbconfig.h
	drivers/net/wireless/bcmdhd/include/sbpcmcia.h
	drivers/net/wireless/bcmdhd/include/sbsdio.h
	drivers/net/wireless/bcmdhd/include/sbsdpcmdev.h
	drivers/net/wireless/bcmdhd/include/sbsocram.h
	drivers/net/wireless/bcmdhd/include/sdio.h
	drivers/net/wireless/bcmdhd/include/sdioh.h
	drivers/net/wireless/bcmdhd/include/sdiovar.h
	drivers/net/wireless/bcmdhd/include/siutils.h
	drivers/net/wireless/bcmdhd/include/trxhdr.h
	drivers/net/wireless/bcmdhd/include/typedefs.h
	drivers/net/wireless/bcmdhd/include/wlfc_proto.h
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/linux_osl.c
	drivers/net/wireless/bcmdhd/sbutils.c
	drivers/net/wireless/bcmdhd/siutils.c
	drivers/net/wireless/bcmdhd/siutils_priv.h
	drivers/net/wireless/bcmdhd/uamp_api.h
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_android.h
	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_cfgp2p.h
	drivers/net/wireless/bcmdhd/wl_dbg.h
	drivers/net/wireless/bcmdhd/wl_iw.c
	drivers/net/wireless/bcmdhd/wl_iw.h
	drivers/net/wireless/bcmdhd/wl_linux_mon.c
	drivers/net/wireless/bcmdhd/wl_roam.c
	drivers/net/wireless/bcmdhd/wldev_common.c
	drivers/net/wireless/bcmdhd/wldev_common.h
	drivers/power/max17042_fuelgauge_u1.c
	drivers/power/sec_battery_px.c
	drivers/power/sec_battery_u1.c
	drivers/regulator/lp8720.c
	drivers/regulator/max77686.c
	drivers/regulator/s5m8767.c
	drivers/rtc/interface.c
	drivers/rtc/rtc-s5m.c
	drivers/samsung/Kconfig
	drivers/samsung/Makefile
	drivers/samsung/fm_si47xx/Si47xx_dev.c
	drivers/samsung/fm_si47xx/Si47xx_i2c_drv.c
	drivers/sensor/ak8963.c
	drivers/sensor/gp2a_proximity.c
	drivers/sensor/lsm330dlc_gyro.c
	drivers/sensorhub/factory/accel_lsm330.c
	drivers/sensorhub/factory/gyro_lsm330.c
	drivers/sensorhub/factory/light_cm36651.c
	drivers/sensorhub/factory/magnetic_ak8963c.c
	drivers/sensorhub/factory/mcu_at32uc3l0128.c
	drivers/sensorhub/factory/pressure_bmp182.c
	drivers/sensorhub/factory/prox_cm36651.c
	drivers/sensorhub/sensors_core.c
	drivers/sensorhub/ssp.h
	drivers/sensorhub/ssp_ak8963c.c
	drivers/sensorhub/ssp_data.c
	drivers/sensorhub/ssp_debug.c
	drivers/sensorhub/ssp_dev.c
	drivers/sensorhub/ssp_firmware.c
	drivers/sensorhub/ssp_i2c.c
	drivers/sensorhub/ssp_sensorhub.c
	drivers/sensorhub/ssp_sysfs.c
	drivers/staging/android/logger.c
	drivers/staging/android/lowmemorykiller.c
	drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
	drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
	drivers/staging/westbridge/astoria/switch/Makefile
	drivers/usb/core/hub.c
	drivers/usb/gadget/android.c
	drivers/usb/gadget/f_accessory.c
	drivers/usb/gadget/f_audio_source.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/f_mtp_samsung.c
	drivers/usb/host/ehci-s5p.c
	drivers/usb/misc/diag_bridge.c
	drivers/usb/misc/mdm_ctrl_bridge.c
	drivers/usb/notify/host_notifier.c
	drivers/usb/serial/csvt.c
	drivers/usb/serial/qcserial.c
	drivers/usb/serial/usb_wwan.c
	drivers/video/samsung/aid_s6e8aa0.h
	drivers/video/samsung/aid_s6evr02.h
	drivers/video/samsung/ld9040.c
	drivers/video/samsung/lms501xx.h
	drivers/video/samsung/mdnie.c
	drivers/video/samsung/mdnie_color_tone_4210.h
	drivers/video/samsung/mdnie_table_c1m0.h
	drivers/video/samsung/mdnie_table_u1.h
	drivers/video/samsung/s3cfb_s6e8aa0.c
	drivers/video/samsung/s6d6aa1.c
	firmware/Makefile
	firmware/SlimISP_GK.bin.ihex
	firmware/SlimISP_ZK.bin.ihex
	firmware/epen/W9001_B746.bin.ihex
	firmware/epen/W9001_B746L.bin.ihex
	firmware/epen/W9001_B746S.bin.ihex
	firmware/epen/W9001_B746VZW.bin.ihex
	firmware/ssp.fw.ihex
	firmware/tsp_atmel/mXT540S.fw.ihex
	firmware/tsp_melfas/gc/B_CORE.fw.ihex
	firmware/tsp_melfas/gc/B_PRIV.fw.ihex
	firmware/tsp_melfas/gc/B_PUBL.fw.ihex
	fs/cifs/cifssmb.c
	fs/ext4/ialloc.c
	fs/ext4/namei.c
	fs/ext4/super.c
	fs/fuse/dev.c
	include/drm/exynos_drm.h
	include/linux/android_alarm.h
	include/linux/battery/samsung_battery.h
	include/linux/compaction.h
	include/linux/cpufreq.h
	include/linux/gfp.h
	include/linux/highmem.h
	include/linux/i2c/fm34_we395.h
	include/linux/i2c/touchkey_i2c.h
	include/linux/input.h
	include/linux/mdm_hsic_pm.h
	include/linux/mfd/max77693-private.h
	include/linux/migrate.h
	include/linux/mmc/host.h
	include/linux/mmzone.h
	include/linux/msm_charm.h
	include/linux/page-flags.h
	include/linux/page-isolation.h
	include/linux/platform_data/cypress_cyttsp4.h
	include/linux/platform_data/mms152_ts.h
	include/linux/rtc.h
	include/linux/videodev2_exynos_camera.h
	include/linux/vmalloc.h
	include/linux/wacom_i2c.h
	include/media/isdbt_pdata.h
	include/net/bluetooth/hci_mon.h
	include/trace/events/cpufreq_interactive.h
	kernel/power/earlysuspend.c
	kernel/power/main.c
	kernel/power/wakelock.c
	kernel/printk.c
	kernel/sched.c
	lib/Kconfig
	mm/Kconfig
	mm/Makefile
	mm/compaction-cma.c
	mm/internal.h
	mm/memory-failure.c
	mm/memory.c
	mm/memory_hotplug.c
	mm/mempolicy.c
	mm/page_alloc-cma.c
	mm/page_isolation-cma.c
	mm/rmap.c
	mm/vmalloc.c
	mm/vmscan.c
	mm/vmstat.c
	scripts/Kbuild.include
	sound/soc/codecs/wm8994.c
	sound/soc/samsung/midas_wm1811.c
	sound/soc/samsung/slp_trats_mc1n2.c
	sound/soc/samsung/t0_wm1811.c

+ ...
mali: update to r3p1-01rel1

Change-Id: I1d8f20dc01a43d384fd18144c04b6157aa559b18

Conflicts:
	drivers/media/video/samsung/mali/Kconfig
	drivers/media/video/samsung/mali/Makefile
	drivers/media/video/samsung/mali/Makefile_module
	drivers/media/video/samsung/mali/arch
	drivers/media/video/samsung/mali/arch-pb-virtex5-m400-1-pmu/config.h
	drivers/media/video/samsung/mali/arch-ve-virtex6-m450-8/config.h
	drivers/media/video/samsung/mali/common/mali_gp.c
	drivers/media/video/samsung/mali/common/mali_gp_job.c
	drivers/media/video/samsung/mali/common/mali_gp_job.h
	drivers/media/video/samsung/mali/common/mali_gp_scheduler.c
	drivers/media/video/samsung/mali/common/mali_group.c
	drivers/media/video/samsung/mali/common/mali_group.h
	drivers/media/video/samsung/mali/common/mali_hw_core.h
	drivers/media/video/samsung/mali/common/mali_kernel_common.h
	drivers/media/video/samsung/mali/common/mali_kernel_core.c
	drivers/media/video/samsung/mali/common/mali_kernel_core.h
	drivers/media/video/samsung/mali/common/mali_kernel_mem_os.c
	drivers/media/video/samsung/mali/common/mali_kernel_utilization.c
	drivers/media/video/samsung/mali/common/mali_l2_cache.c
	drivers/media/video/samsung/mali/common/mali_memory.c
	drivers/media/video/samsung/mali/common/mali_memory.h
	drivers/media/video/samsung/mali/common/mali_mmu_page_directory.c
	drivers/media/video/samsung/mali/common/mali_mmu_page_directory.h
	drivers/media/video/samsung/mali/common/mali_osk_list.h
	drivers/media/video/samsung/mali/common/mali_osk_profiling.h
	drivers/media/video/samsung/mali/common/mali_pm.c
	drivers/media/video/samsung/mali/common/mali_pp.c
	drivers/media/video/samsung/mali/common/mali_pp_job.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/mali_session.h
	drivers/media/video/samsung/mali/common/mali_ukk.h
	drivers/media/video/samsung/mali/common/mali_user_settings_db.c
	drivers/media/video/samsung/mali/common/pmm/mali_pmm.c
	drivers/media/video/samsung/mali/include/linux/mali/mali_utgard_ioctl.h
	drivers/media/video/samsung/mali/include/linux/mali/mali_utgard_profiling_events.h
	drivers/media/video/samsung/mali/include/linux/mali/mali_utgard_uk_types.h
	drivers/media/video/samsung/mali/linux/mali_kernel_ioctl.h
	drivers/media/video/samsung/mali/linux/mali_kernel_linux.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_kernel_sysfs.h
	drivers/media/video/samsung/mali/linux/mali_linux_trace.h
	drivers/media/video/samsung/mali/linux/mali_osk_indir_mmap.c
	drivers/media/video/samsung/mali/linux/mali_osk_indir_mmap.h
	drivers/media/video/samsung/mali/linux/mali_osk_mali.c
	drivers/media/video/samsung/mali/linux/mali_osk_memory.c
	drivers/media/video/samsung/mali/linux/mali_osk_pm.c
	drivers/media/video/samsung/mali/linux/mali_osk_profiling.c
	drivers/media/video/samsung/mali/linux/mali_osk_profiling_gator.c
	drivers/media/video/samsung/mali/linux/mali_osk_specific.h
	drivers/media/video/samsung/mali/linux/mali_profiling_internal.c
	drivers/media/video/samsung/mali/linux/mali_uk_types.h
	drivers/media/video/samsung/mali/linux/mali_ukk_gp.c
	drivers/media/video/samsung/mali/linux/mali_ukk_pp.c
	drivers/media/video/samsung/mali/linux/mali_ukk_wrappers.h
	drivers/media/video/samsung/mali/platform/default/mali_platform.c
	drivers/media/video/samsung/mali/platform/mali_platform.h
	drivers/media/video/samsung/mali/platform/orion-m400/mali_platform.c
	drivers/media/video/samsung/mali/platform/orion-m400/mali_platform_dvfs.c
	drivers/media/video/samsung/mali/platform/pegasus-m400/mali_platform.c
	drivers/media/video/samsung/mali/timestamp-arm11-cc/mali_timestamp.c
	drivers/media/video/samsung/mali/timestamp-arm11-cc/mali_timestamp.h
	drivers/media/video/samsung/mali/timestamp-default/mali_timestamp.c
	drivers/media/video/samsung/mali/timestamp-default/mali_timestamp.h
	drivers/media/video/samsung/mali_r3p0_lsi/arch-pegasus-m400/config.h
	drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_osk_profiling_gator.c
	drivers/media/video/samsung/mali_r3p0_lsi/readme.txt
	drivers/media/video/samsung/ump/Kconfig
	drivers/media/video/samsung/ump/arch
	drivers/media/video/samsung/ump/common/ump_kernel_common.c
	drivers/media/video/samsung/ump/linux/ump_kernel_linux.c
	drivers/media/video/samsung/ump/linux/ump_kernel_memory_backend_os.c
	drivers/media/video/samsung/ump/linux/ump_osk_low_level_mem.c
	drivers/media/video/samsung/ump/linux/ump_ukk_wrappers.h
+ full sync ...
+ fix build-script ...