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

drivers/crypto/msm/qcedev.c

drivers/md/dm-ioctl.c

...ers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

...dia/platform/msm/camera_v2/sensor/actuator/msm_actuator.c

drivers/platform/msm/sps/sps.c

drivers/platform/msm/sps/spsi.h

sound/core/timer.c