Merge branch 'jb_2.6' of git://codeaurora.org/kernel/msm into cm-10.2

Conflicts:
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mm/dma-mapping.c
	drivers/base/sync.c
	drivers/char/diag/diagchar_core.c
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_a3xx.c
	drivers/gpu/msm/kgsl.c
	drivers/input/touchscreen/synaptics_fw_update.c
	drivers/input/touchscreen/synaptics_i2c_rmi4.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/power/pm8xxx-ccadc.c
	drivers/tty/serial/msm_serial_hs.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/vidc/common/enc/venc.c
	include/linux/msm_vidc_enc.h
	include/linux/nl80211.h
	include/media/msm/vcd_property.h
	include/media/msm_camera.h
	include/video/msm_hdmi_modes.h
	scripts/gcc-wrapper.py

Change-Id: I24e610b9a5c48109dc4846e8024ca2d7ee631cd2
d2: Disable binary syscall interface

 * This is long since deprecated and doesn't compile anymore. I have no
   idea why it was enabled on the stock ROM.

Change-Id: Ie04bba22d2d8f4a8233fb87a9807d1536b4ebe22