Merge branch mp into fairphone

* m/8901-fairphone-p-mp-release:
  2nd camera failed to suspend
  Revert "Camera Module Rear 2nd Source Backward Compatibility"
  msm_actuator masked out pr_err(..)
  Camera Module Rear 2nd Source Backward Compatibility
  msm: adsprpc: maintain local copy of rpra offloaded to DSP
  msm: adsprpc: Fix integer overflow in refcount of map
  msm: camera: eeprom: Release the mutex even though got error
  msm: camera: eeprom: Release the mutex even though got error
  staging: android: ashmem: Disallow ashmem memory from being remapped
  rtlwifi: Fix potential overflow on P2P code
  ALSA: core: Fix card races between register and disconnect
  block: blk_init_allocated_queue() set q->fq as NULL in the fail case

Change-Id: I851c727f34cacdf0aef8f4dc2cad6cb9b57eefa9