ZTE nubia Z5S JellyBean kernel(3.4.x) source code
Merge branch 'org_v1.30' into jb-4.2

modify some stupid error

Conflicts:
	AndroidKernel.mk
	Documentation/arm/Samsung/clksrc-change-registers.awk
	Documentation/devicetree/bindings/leds/leds-qpnp.txt
	Documentation/devicetree/bindings/power/qpnp-charger.txt
	Documentation/devicetree/bindings/pwm/qpnp-pwm.txt
	Documentation/dvb/get_dvb_firmware
	Documentation/target/tcm_mod_builder.py
	arch/arm/Kconfig
	arch/arm/boot/dts/dsi-panel-toshiba-720p-video.dtsi
	arch/arm/boot/dts/msm-pm8019.dtsi
	arch/arm/boot/dts/msm-pm8941.dtsi
	arch/arm/boot/dts/msm8226-camera-sensor-cdp.dtsi
	arch/arm/boot/dts/msm8226-camera-sensor-mtp.dtsi
	arch/arm/boot/dts/msm8226-camera-sensor-qrd.dtsi
	arch/arm/boot/dts/msm8226-camera.dtsi
	arch/arm/boot/dts/msm8974-camera-sensor-fluid.dtsi
	arch/arm/boot/dts/msm8974-camera-sensor-mtp.dtsi
	arch/arm/boot/dts/msm8974-camera.dtsi
	arch/arm/boot/dts/msm8974-cdp.dtsi
	arch/arm/boot/dts/msm8974-fluid.dtsi
	arch/arm/boot/dts/msm8974-leds.dtsi
	arch/arm/boot/dts/msm8974-liquid.dtsi
	arch/arm/boot/dts/msm8974-mdss.dtsi
	arch/arm/boot/dts/msm8974-mtp.dtsi
	arch/arm/boot/dts/msm8974-rumi.dtsi
	arch/arm/boot/dts/msm8974-v1-pm.dtsi
	arch/arm/boot/dts/msm8974-v2-pm.dtsi
	arch/arm/boot/dts/msm8974-v2.0-1-mtp-ztemt-NX503A.dts
	arch/arm/boot/dts/msm8974-v2.2-mtp-ztemt-NX503A.dts
	arch/arm/boot/dts/msm8974.dtsi
	arch/arm/boot/dts/ztedts/ztemt_dsi-panel-sharp-1080p-ips-video.dtsi
	arch/arm/boot/dts/ztedts/ztemt_dsi-panel-toshiba-720p-video.dtsi
	arch/arm/boot/dts/ztedts/ztemt_msm-pm8941.dtsi
	arch/arm/boot/dts/ztedts/ztemt_msm8974-camera-sensor-mtp.dtsi
	arch/arm/boot/dts/ztedts/ztemt_msm8974-leds.dtsi
	arch/arm/boot/dts/ztedts/ztemt_msm8974-mdss.dtsi
	arch/arm/boot/dts/ztedts/ztemt_msm8974-mtp.dtsi
	arch/arm/boot/dts/ztedts/ztemt_msm8974-regulator.dtsi
	arch/arm/boot/dts/ztedts/ztemt_msm8974-v2.0-1.dtsi
	arch/arm/boot/dts/ztedts/ztemt_msm8974-v2.2.dtsi
	arch/arm/boot/dts/ztedts/ztemt_msm8974-v2.dtsi
	arch/arm/boot/dts/ztedts/ztemt_msm8974.dtsi
	arch/arm/configs/msm8974-NX503A_defconfig
	arch/arm/include/asm/elf.h
	arch/arm/include/asm/mach/irq.h
	arch/arm/include/asm/mmu.h
	arch/arm/include/asm/page.h
	arch/arm/include/asm/thread_info.h
	arch/arm/include/asm/tls.h
	arch/arm/kernel/fiq.c
	arch/arm/kernel/perf_event.c
	arch/arm/kernel/process.c
	arch/arm/kernel/ptrace.c
	arch/arm/kernel/signal.c
	arch/arm/kernel/signal.h
	arch/arm/kernel/traps.c
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/Makefile.boot
	arch/arm/mach-msm/bms_ztemt_batterydata_2300mAh.c
	arch/arm/mach-msm/board-8974-brcm-wifi.c
	arch/arm/mach-msm/board/Kconfig
	arch/arm/mach-msm/board/Makefile
	arch/arm/mach-msm/board/nubia-board.c
	arch/arm/mach-msm/board/nubia-clock.c
	arch/arm/mach-msm/board/nubia-gpiomux.c
	arch/arm/mach-msm/clock-8974.c
	arch/arm/mach-msm/clock-debug.c
	arch/arm/mach-msm/lpm_levels.c
	arch/arm/mach-msm/msm_rq_stats.c
	arch/arm/mach-msm/qdsp6v2/aac_in.c
	arch/arm/mach-msm/qdsp6v2/audio_acdb.c
	arch/arm/mach-msm/qdsp6v2/audio_utils.c
	arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
	arch/arm/mach-msm/restart.c
	arch/arm/mach-msm/sensors_adsp.c
	arch/arm/mach-msm/smd_rpc_sym
	arch/arm/mach-rpc/irq.c
	arch/arm/mm/Kconfig
	arch/arm/mm/mmu.c
	arch/arm/plat-mxc/avic.c
	arch/arm/plat-mxc/tzic.c
	arch/arm/plat-s3c24xx/irq.c
	arch/ia64/scripts/check-gas
	arch/ia64/scripts/toolchain-flags
	arch/microblaze/boot/dts/system.dts
	arch/powerpc/boot/wrapper
	arch/powerpc/relocs_check.pl
	arch/x86/vdso/checkundef.sh
	drivers/base/power/wakeup.c
	drivers/bluetooth/bluesleep.c
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diagchar.h
	drivers/char/diag/diagfwd.c
	drivers/char/diag/diagfwd.h
	drivers/char/diag/diagfwd_cntl.c
	drivers/hwmon/Kconfig
	drivers/hwmon/Makefile
	drivers/hwmon/als_prox.c
	drivers/hwmon/aw_9106b.c
	drivers/hwmon/maxq616.c
	drivers/hwmon/qpnp-adc-common.c
	drivers/hwmon/qpnp-device-info.c
	drivers/hwmon/sensor_common.c
	drivers/hwmon/shtc1.c
	drivers/hwmon/tmd2772.c
	drivers/hwmon/tmg399x.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/input/touchscreen/cyttsp4/Kconfig
	drivers/input/touchscreen/cyttsp4/Makefile
	drivers/input/touchscreen/cyttsp4/cyttsp4_btn.c
	drivers/input/touchscreen/cyttsp4/cyttsp4_btn.h
	drivers/input/touchscreen/cyttsp4/cyttsp4_bus.c
	drivers/input/touchscreen/cyttsp4/cyttsp4_bus.h
	drivers/input/touchscreen/cyttsp4/cyttsp4_core.c
	drivers/input/touchscreen/cyttsp4/cyttsp4_core.h
	drivers/input/touchscreen/cyttsp4/cyttsp4_debug.c
	drivers/input/touchscreen/cyttsp4/cyttsp4_device_access.c
	drivers/input/touchscreen/cyttsp4/cyttsp4_device_access.h
	drivers/input/touchscreen/cyttsp4/cyttsp4_i2c.c
	drivers/input/touchscreen/cyttsp4/cyttsp4_i2c.h
	drivers/input/touchscreen/cyttsp4/cyttsp4_loader.c
	drivers/input/touchscreen/cyttsp4/cyttsp4_mt.h
	drivers/input/touchscreen/cyttsp4/cyttsp4_mt_common.c
	drivers/input/touchscreen/cyttsp4/cyttsp4_mt_common.h
	drivers/input/touchscreen/cyttsp4/cyttsp4_mta.c
	drivers/input/touchscreen/cyttsp4/cyttsp4_mtb.c
	drivers/input/touchscreen/cyttsp4/cyttsp4_regs.h
	drivers/input/touchscreen/cyttsp4/cyttsp4_spi.c
	drivers/input/touchscreen/cyttsp4/cyttsp4_spi.h
	drivers/input/touchscreen/cyttsp4/zte_ctp.c
	drivers/leds/leds-qpnp.c
	drivers/media/platform/msm/Kconfig
	drivers/media/platform/msm/Makefile
	drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
	drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
	drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
	drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c
	drivers/media/platform/msm/camera_v2/sensor/Makefile
	drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
	drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
	drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
	drivers/media/platform/msm/camera_v2/sensor/imx135.c
	drivers/media/platform/msm/camera_v2/sensor/imx135_069.c
	drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
	drivers/media/platform/msm/camera_v2/sensor/ois/Ois.h
	drivers/media/platform/msm/camera_v2/sensor/ois/OisCmd.c
	drivers/media/platform/msm/camera_v2/sensor/ois/OisDef.h
	drivers/media/platform/msm/camera_v2/sensor/ois/OisFil.h
	drivers/media/platform/msm/camera_v2/sensor/ois/OisIni.c
	drivers/media/platform/msm/camera_v2/sensor/ov5648.c
	drivers/media/platform/msm/dvb/demux/mpq_dmx_plugin_common.c
	drivers/media/platform/msm/wfd/wfd-ioctl.c
	drivers/misc/Kconfig
	drivers/misc/drv2605.c
	drivers/misc/qseecom.c
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/mmc/core/host.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sdio.c
	drivers/mmc/core/sdio_io.c
	drivers/mmc/host/sdhci-msm.c
	drivers/mmc/host/sdhci.c
	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/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_dbg.h
	drivers/net/wireless/bcmdhd/dhd_ip.c
	drivers/net/wireless/bcmdhd/dhd_ip.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_wlfc.c
	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/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/bcmdevs.h
	drivers/net/wireless/bcmdhd/include/bcmendian.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/bcmwifi_channels.h
	drivers/net/wireless/bcmdhd/include/bcmwifi_rates.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.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/802.3.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/sbchipc.h
	drivers/net/wireless/bcmdhd/include/sbconfig.h
	drivers/net/wireless/bcmdhd/include/sbhnddma.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/wldev_common.c
	drivers/net/wireless/bcmdhd/wldev_common.h
	drivers/net/wireless/wcnss/wcnss_wlan.c
	drivers/nfc/Makefile
	drivers/nfc/nxp_pn544.c
	drivers/platform/msm/qpnp-pwm.c
	drivers/power/Kconfig
	drivers/power/power_supply_core.c
	drivers/power/power_supply_sysfs.c
	drivers/power/qpnp-bms.c
	drivers/power/qpnp-charger.c
	drivers/rtc/qpnp-rtc.c
	drivers/slimbus/slim-msm-ngd.c
	drivers/staging/usbip/userspace/autogen.sh
	drivers/staging/usbip/userspace/cleanup.sh
	drivers/usb/Kconfig
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/core.h
	drivers/usb/dwc3/dwc3-msm.c
	drivers/usb/dwc3/dwc3_otg.c
	drivers/usb/dwc3/dwc3_otg.h
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/android.c
	drivers/usb/gadget/f_accessory.c
	drivers/video/msm/mdss/Kconfig
	drivers/video/msm/mdss/Makefile
	drivers/video/msm/mdss/mdp3_ppp_data.c
	drivers/video/msm/mdss/mdss_dsi.c
	drivers/video/msm/mdss/mdss_dsi.h
	drivers/video/msm/mdss/mdss_dsi_host.c
	drivers/video/msm/mdss/mdss_dsi_panel.c
	drivers/video/msm/mdss/mdss_fb.c
	drivers/video/msm/mdss/mdss_hdmi_edid.c
	drivers/video/msm/mdss/mdss_hdmi_tx.c
	drivers/video/msm/mdss/mdss_io_util.c
	drivers/video/msm/mdss/mdss_mdp_ctl.c
	drivers/video/msm/mdss/mdss_mdp_pipe.c
	drivers/video/msm/mdss/mhl_sii8334.c
	drivers/video/msm/mdss/slimport_anx7808/Kconfig
	drivers/video/msm/mdss/slimport_anx7808/Makefile
	drivers/video/msm/mdss/slimport_anx7808/cec_lib/Kconfig
	drivers/video/msm/mdss/slimport_anx7808/cec_lib/Makefile
	drivers/video/msm/mdss/slimport_anx7808/cec_lib/slimport_tx_cec.c
	drivers/video/msm/mdss/slimport_anx7808/cec_lib/slimport_tx_cec.h
	drivers/video/msm/mdss/slimport_anx7808/slimport.c
	drivers/video/msm/mdss/slimport_anx7808/slimport.h
	drivers/video/msm/mdss/slimport_anx7808/slimport_tx_drv.c
	drivers/video/msm/mdss/slimport_anx7808/slimport_tx_drv.h
	drivers/video/msm/mdss/slimport_anx7808/slimport_tx_reg.h
	drivers/video/msm/mdss/zte_disp_enhance.c
	drivers/video/msm/mdss/zte_tps65132.c
	drivers/video/msm/mdss/zte_tps65132.h
	fs/Kconfig
	fs/Makefile
	include/linux/i2c/drv2605.h
	include/linux/i2c/esxxx.h
	include/linux/i2c/sensor_common.h
	include/linux/i2c/shtc1.h
	include/linux/i2c/taos_common.h
	include/linux/i2c/tmg399x.h
	include/linux/ieee80211.h
	include/linux/mfd/pm8xxx/batterydata-lib.h
	include/linux/nl80211.h
	include/linux/platform_data/slimport_device.h
	include/linux/pn544.h
	include/linux/power_supply.h
	include/linux/qpnp/qpnp-adc.h
	include/linux/qpnp/qpnp-device-info.h
	include/media/msm_cam_sensor.h
	include/media/msm_camera.h
	include/sound/apr_audio-v2.h
	include/sound/q6asm-v2.h
	kernel/power/suspend.c
	mm/page_alloc.c
	net/nfc/core.c
	net/wireless/nl80211.c
	scripts/Lindent
	scripts/bloat-o-meter
	scripts/build-all.py
	scripts/checkincludes.pl
	scripts/checkkconfigsymbols.sh
	scripts/checkpatch.pl
	scripts/checkstack.pl
	scripts/checksyscalls.sh
	scripts/checkversion.pl
	scripts/cleanfile
	scripts/cleanpatch
	scripts/coccicheck
	scripts/config
	scripts/decodecode
	scripts/depmod.sh
	scripts/diffconfig
	scripts/extract-ikconfig
	scripts/extract-vmlinux
	scripts/gcc-wrapper.py
	scripts/get_maintainer.pl
	scripts/headerdep.pl
	scripts/headers.sh
	scripts/kconfig/check.sh
	scripts/kconfig/merge_config.sh
	scripts/kernel-doc
	scripts/makelst
	scripts/mkcompile_h
	scripts/mkuboot.sh
	scripts/namespace.pl
	scripts/package/mkspec
	scripts/patch-kernel
	scripts/recordmcount.pl
	scripts/setlocalversion
	scripts/show_delta
	scripts/tags.sh
	scripts/ver_linux
	sound/Kconfig
	sound/core/pcm_lib.c
	sound/soc/codecs/es325-access.h
	sound/soc/codecs/es325-export.h
	sound/soc/codecs/es325.c
	sound/soc/codecs/es325.h
	sound/soc/codecs/wcd9xxx-mbhc.c
	sound/soc/msm/msm-pcm-voip.c
	sound/soc/msm/msm8974.c
	sound/soc/msm/qdsp6/q6voice.c
	sound/soc/msm/qdsp6v2/audio_acdb.c
	sound/soc/msm/qdsp6v2/audio_acdb.h
	sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c
	sound/soc/msm/qdsp6v2/msm-dolby-dap-config.c
	sound/soc/msm/qdsp6v2/msm-dolby-dap-config.h
	sound/soc/msm/qdsp6v2/msm-pcm-lpa-v2.c
	sound/soc/msm/qdsp6v2/msm-pcm-voip-v2.c
	sound/soc/msm/qdsp6v2/q6asm.c
	sound/soc/msm/qdsp6v2/q6voice.c
	tools/nfsd/inject_fault.sh
	tools/perf/python/twatch.py
	tools/perf/scripts/python/bin/net_dropmonitor-record
	tools/perf/scripts/python/bin/net_dropmonitor-report
	tools/perf/scripts/python/net_dropmonitor.py
	tools/perf/util/PERF-VERSION-GEN
	tools/perf/util/generate-cmdlist.sh
	tools/power/cpupower/utils/version-gen.sh
	tools/testing/ktest/compare-ktest-sample.pl
	tools/testing/ktest/ktest.pl