diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 17:44:15 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 17:44:15 +0300 |
| commit | 9ff3d178ab9e926b3194b266b4a28dc63226552d (patch) | |
| tree | 009ee8ba0d0dc23c4e0284b413a7f038925b378f /arch/x86/include/asm/thread_info.h | |
| parent | e14cfad3fef6f1d0a968aca639481139747ffcde (diff) | |
| parent | 9626b6993b2e6faf047d2d96958e8474edc9c7a5 (diff) | |
| download | linux-9ff3d178ab9e926b3194b266b4a28dc63226552d.tar.xz | |
Merge tag 'qcom-soc-for-4.2-1' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/x86/include/asm/thread_info.h')
0 files changed, 0 insertions, 0 deletions