Merge tag 'qcom-soc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/agross...

Qualcomm ARM Based SoC Updates for v4.7

* Add stubs for smem_state to fix build issues
* Fix module usage in SPM driver
* Add i2c and spi entries into QCOM MAINTAINERS entry
* Add SMD multi channel support
* Add clks to QCOM MAINTAINERS

* tag 'qcom-soc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  soc: qcom: smd: Support opening additional channels
  soc: qcom: smd: Support multiple channels per sdev
  soc: qcom: smd: Refactor channel open and close handling
  soc: qcom: smd: Split discovery and state change work
  soc: qcom: smd: Introduce callback setter
  drivers: qcom: spm: avoid module usage in non-modular SPM driver
  soc: qcom: smem_state: Add stubs for disabled smem_state
  MAINTAINERS: add qcom clocks to the maintainers list
  MAINTAINERS: add qcom i2c and spi drivers to list

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc MAINTAINERS
Simple merge