Merge branch 'android-msm-shamu-3.10-nyc-security-next' into android-msm-shamu-3.10-nyc

arch/arm/configs/shamu_defconfig

arch/arm/mach-msm/smp2p.c

arch/arm/mach-msm/smp2p_debug.c

arch/arm/mach-msm/smp2p_gpio.c

arch/arm/mach-msm/smp2p_test.c

block/genhd.c

drivers/crypto/msm/qcedev.c

drivers/crypto/msm/qcrypto.c

drivers/hid/hid-core.c

...dia/platform/msm/camera_v2/sensor/io/msm_camera_cci_i2c.c

...dia/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c

drivers/media/platform/msm/vidc/hfi_packetization.c

drivers/media/platform/msm/vidc/hfi_response_handler.c

drivers/media/platform/msm/vidc/msm_smem.c

drivers/media/platform/msm/vidc/msm_v4l2_vidc.c

drivers/media/platform/msm/vidc/msm_vdec.c

drivers/media/platform/msm/vidc/msm_venc.c

drivers/media/platform/msm/vidc/msm_vidc.c

drivers/media/platform/msm/vidc/msm_vidc_common.c

drivers/media/platform/msm/vidc/msm_vidc_debug.c