diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2015-04-07 15:16:03 +0100 |
|---|---|---|
| committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2015-04-07 15:16:03 +0100 |
| commit | 8cb3a2dfb116925da331ce743b81fde4d9201267 (patch) | |
| tree | 74f1432f12f73546599c317c5c7f25d15db2e33a /Documentation/networking/tcp-thin.txt | |
| parent | 0b9702eefb577338e5ee6fea30fde1487f2fa1a7 (diff) | |
| parent | bf2ae3fb98a15e9ca6f947fe3a1ce0706f9ef882 (diff) | |
Merge branch 'tracking-qcomlt-msm8916-smd-rpm' into integration-linux-qcomlttracking-integration-linux-qcomlt-ll-20150416.0tracking-integration-linux-qcomlt-ll-20150414.0qcomlt-v4.0-rc7
* tracking-qcomlt-msm8916-smd-rpm:
smd: perform SMD channel scanning synchronously at probe
regulator: add support for RPM SMD regulator - build fix
regulator: add support for RPM SMD regulator
soc: qcom: add RPM SMD driver
soc: qcom: add support for SMD
soc: qcom: add subsystem_restart.h header file
soc: qcom: add SMSM header file
qcom: add support for SMEM
qcom: add subsystem_notif header file
qcom: ramdump: add header file
msm: add ipc logging header
hwspinlock: msm: add hardware spinlock support
Conflicts:
drivers/soc/qcom/Kconfig
drivers/soc/qcom/Makefile
Diffstat (limited to 'Documentation/networking/tcp-thin.txt')
0 files changed, 0 insertions, 0 deletions