| commit | d3e2442b51c33c77a7d409ddcec4805b7ad991c4 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Apr 25 23:50:41 2016 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Apr 25 23:50:41 2016 +0200 |
| tree | 873168f5bad4a7d6cbf4a8e7f627d98e4c6c883b | |
| parent | c6ba3f693297fb900ad7435cc963abd2582b1176 [diff] | |
| parent | b853cb9628bfbcc4017da46d5f5b46e3eba9d8c6 [diff] |
Merge tag 'qcom-soc-for-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers Merge "Qualcomm ARM Based SoC Updates for v4.7 part 2" from Andy Gross: * Change SMD callback parameters * Use writecombine mapping for SMEM * tag 'qcom-soc-for-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: soc: qcom: smd: Make callback pass channel reference soc: qcom: smem: Use write-combine remap for SMEM