]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge tag 'qcom-soc-for-4.7' into soc-for-4.7-p2
authorAndy Gross <andy.gross@linaro.org>
Wed, 20 Apr 2016 02:39:16 +0000 (21:39 -0500)
committerAndy Gross <andy.gross@linaro.org>
Wed, 20 Apr 2016 02:39:16 +0000 (21:39 -0500)
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


Trivial merge