Merge tag 'qcom-soc-for-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...
authorArnd Bergmann <arnd@arndb.de>
Fri, 29 May 2015 14:44:15 +0000 (16:44 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 29 May 2015 14:44:15 +0000 (16:44 +0200)
Merge "Qualcomm ARM Based SoC Updates for v4.2-1" from Kumar Gala:

* Added Subsystem Power Manager (SPM) driver
* Split out 32-bit specific SCM code
* Added HDCP SCM call

* tag 'qcom-soc-for-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  firmware: qcom: scm: Add HDCP Support
  firmware: qcom: scm: Split out 32-bit specific SCM code
  ARM: qcom: Add Subsystem Power Manager (SPM) driver


Trivial merge