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)
commit9ff3d178ab9e926b3194b266b4a28dc63226552d
tree009ee8ba0d0dc23c4e0284b413a7f038925b378f
parente14cfad3fef6f1d0a968aca639481139747ffcde
parent9626b6993b2e6faf047d2d96958e8474edc9c7a5
Merge tag 'qcom-soc-for-4.2-1' of git://git./linux/kernel/git/galak/linux-qcom into next/drivers

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