Merge branch 'android-msm-angler-3.10-nyc-mr1' into android-msm-angler-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/wireless/bcmdhd/bcmutils.c

drivers/net/wireless/bcmdhd/dhd.h

drivers/net/wireless/bcmdhd/dhd_bta.c

drivers/net/wireless/bcmdhd/dhd_common.c

drivers/net/wireless/bcmdhd/dhd_debug.c

drivers/net/wireless/bcmdhd/dhd_debug_linux.c

drivers/net/wireless/bcmdhd/dhd_flowring.c

drivers/net/wireless/bcmdhd/dhd_linux.c

drivers/net/wireless/bcmdhd/dhd_pno.c

drivers/net/wireless/bcmdhd/dhd_rtt.c

drivers/net/wireless/bcmdhd/dhd_sdio.c