From: Andy Gross Date: Wed, 20 Apr 2016 02:39:16 +0000 (-0500) Subject: Merge tag 'qcom-soc-for-4.7' into soc-for-4.7-p2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b55b592ee374d3f04f41c2e6fd259ca2c0f1d333;p=linux-beck.git Merge tag 'qcom-soc-for-4.7' into soc-for-4.7-p2 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 --- b55b592ee374d3f04f41c2e6fd259ca2c0f1d333