Merge branch 'android-msm-bullhead-3.10-nyc-mr1' into android-msm-bullhead-3.10-nyc-mr2

drivers/char/adsprpc.c

drivers/crypto/msm/ota_crypto.c

drivers/crypto/msm/qce50.c

drivers/crypto/msm/qcedev.c

drivers/crypto/msm/qcrypto.c

drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c

...ers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c

drivers/media/usb/uvc/uvc_ctrl.c

drivers/misc/qseecom.c

drivers/net/ethernet/msm/rndis_ipa.c

drivers/power/qpnp-fg.c

drivers/slimbus/slim-msm-ngd.c

drivers/slimbus/slim-msm.h

drivers/soc/qcom/qdsp6v2/voice_svc.c

drivers/soc/qcom/scm.c

drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c

drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_memdump.c

drivers/staging/qcacld-2.0/CORE/SERVICES/WMA/wma.c

drivers/uio/msm_sharedmem/sharedmem_qmi.c

drivers/video/msm/mdss/mdss_debug.c