Merge in ME4 source jizzer style

Conflicts:

	arch/arm/mach-msm/board-jf_dcm.c
	drivers/media/video/msm/sensors/jc_v4l2.c
	drivers/sensorhub/ssp_firmware.c
	firmware/ssp_rev03.fw.ihex
	include/media/msm_camera.h

	modified:   arch/arm/configs/jactive_att_defconfig
	modified:   arch/arm/configs/jactive_eur_defconfig
	modified:   arch/arm/kernel/process.c
	modified:   arch/arm/mach-msm/Kconfig
	modified:   arch/arm/mach-msm/board-8064-camera.c
	modified:   arch/arm/mach-msm/board-8064-display.c
	modified:   arch/arm/mach-msm/board-8064-pmic.c
	modified:   arch/arm/mach-msm/board-8064-storage.c
	modified:   arch/arm/mach-msm/board-8064.c
	modified:   arch/arm/mach-msm/board-fusion3-battery.c
	modified:   arch/arm/mach-msm/board-jactive_att-gpiomux.c
	modified:   arch/arm/mach-msm/board-jactive_att.c
	modified:   arch/arm/mach-msm/board-jf_att-gpiomux.c
	modified:   arch/arm/mach-msm/board-jf_cri-gpiomux.c
	modified:   arch/arm/mach-msm/board-jf_dcm.c
	modified:   arch/arm/mach-msm/board-jf_eur-gpiomux.c
	modified:   arch/arm/mach-msm/board-jf_spr-gpiomux.c
	modified:   arch/arm/mach-msm/board-jf_tmo-gpiomux.c
	modified:   arch/arm/mach-msm/board-jf_usc-gpiomux.c
	modified:   arch/arm/mach-msm/board-jf_vzw-gpiomux.c
	modified:   arch/arm/mach-msm/clock-8960.c
	modified:   arch/arm/mach-msm/devices-8064.c
	modified:   arch/arm/mach-msm/devices-msm8x60.h
	modified:   arch/arm/mach-msm/include/mach/board.h
	modified:   arch/arm/mach-msm/include/mach/jactive_att-gpio.h
	modified:   arch/arm/mach-msm/mdm2.c
	modified:   drivers/barcode_emul/barcode_emul_ice4.c
	modified:   drivers/battery/max77693_charger.c
	modified:   drivers/felica/felica.c
	modified:   drivers/felica/felica.h
	modified:   drivers/input/keyboard/cypress_touchkey_236/cypress-touchkey-236.c
	modified:   drivers/input/keyboard/cypress_touchkey_236/cypress_tkey_fw.h
	new file:   drivers/input/keyboard/cypress_touchkey_236/fusion3_tkey_fw_20055.h
	modified:   drivers/input/keyboard/cypress_touchkey_236/issp_driver_routines.c
	modified:   drivers/media/video/msm/sensors/jc_v4l2.c
	modified:   drivers/mmc/host/msm_sdcc.c
	modified:   drivers/mmc/host/msm_sdcc.h
	modified:   drivers/motor/immvibespi.c
	modified:   drivers/net/wireless/bcmdhd/Kconfig
	modified:   drivers/net/wireless/bcmdhd/Makefile
	modified:   drivers/net/wireless/bcmdhd/aiutils.c
	modified:   drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
	modified:   drivers/net/wireless/bcmdhd/bcmsdspi_linux.c
	modified:   drivers/net/wireless/bcmdhd/bcmspibrcm.c
	modified:   drivers/net/wireless/bcmdhd/bcmwifi_channels.c
	modified:   drivers/net/wireless/bcmdhd/bcmwifi_channels.h
	modified:   drivers/net/wireless/bcmdhd/bcmwifi_rates.h
	modified:   drivers/net/wireless/bcmdhd/dhd_linux.c
	modified:   drivers/net/wireless/bcmdhd/dhd_sec_feature.h
	modified:   drivers/net/wireless/bcmdhd/include/bcmdevs.h
	modified:   drivers/net/wireless/bcmdhd/include/bcmnvram.h
	modified:   drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h
	modified:   drivers/net/wireless/bcmdhd/include/bcmsrom_tbl.h
	modified:   drivers/net/wireless/bcmdhd/include/bcmutils.h
	modified:   drivers/net/wireless/bcmdhd/include/epivers.h
	modified:   drivers/net/wireless/bcmdhd/include/linuxver.h
	modified:   drivers/net/wireless/bcmdhd/include/osl.h
	modified:   drivers/net/wireless/bcmdhd/include/proto/802.11.h
	modified:   drivers/net/wireless/bcmdhd/include/proto/bcmevent.h
	modified:   drivers/net/wireless/bcmdhd/include/proto/bcmip.h
	modified:   drivers/net/wireless/bcmdhd/include/proto/ethernet.h
	modified:   drivers/net/wireless/bcmdhd/include/proto/p2p.h
	modified:   drivers/net/wireless/bcmdhd/include/proto/vlan.h
	modified:   drivers/net/wireless/bcmdhd/include/proto/wpa.h
	modified:   drivers/net/wireless/bcmdhd/include/sbchipc.h
	modified:   drivers/net/wireless/bcmdhd/include/sbhnddma.h
	modified:   drivers/net/wireless/bcmdhd/include/sbsdio.h
	modified:   drivers/net/wireless/bcmdhd/siutils.c
	modified:   drivers/net/wireless/bcmdhd/wl_android.c
	modified:   drivers/net/wireless/bcmdhd/wl_iw.c
	modified:   drivers/rtc/rtc-pm8xxx.c
	modified:   drivers/sensorhub/ssp_firmware.c
	modified:   drivers/staging/android/lowmemorykiller.c
	modified:   drivers/thermal/msm8960_tsens.c
	modified:   drivers/tty/serial/msm_serial_hs_lite.c
	modified:   drivers/usb/gadget/u_ether.c
	modified:   firmware/ssp_rev03.fw.ihex
	modified:   fs/ext4/namei.c
	modified:   fs/sdcardfs/Kconfig
	modified:   fs/sdcardfs/dentry.c
	modified:   fs/sdcardfs/lookup.c
	modified:   fs/sdcardfs/sdcardfs.h
	modified:   include/linux/barcode_emul.h
	modified:   include/linux/i2c/cypress_touchkey.h
	modified:   include/linux/namei.h
	modified:   include/media/msm_camera.h
	modified:   include/media/msm_isp.h
	modified:   sound/soc/msm/apq8064.c
Merge in ME4 source jizzer style

Conflicts:

	drivers/media/video/msm/sensors/jc_v4l2.c
	drivers/sensorhub/ssp_firmware.c
	firmware/ssp_rev03.fw.ihex
	include/media/msm_camera.h

	modified:   drivers/media/video/msm/sensors/jc_v4l2.c
	modified:   drivers/sensorhub/ssp_firmware.c
	modified:   firmware/ssp_rev03.fw.ihex
	modified:   include/media/msm_camera.h