Merge tag 'qcom-soc-for-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agros...
authorArnd Bergmann <arnd@arndb.de>
Mon, 25 Apr 2016 21:50:41 +0000 (23:50 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 25 Apr 2016 21:50:41 +0000 (23:50 +0200)
commitd3e2442b51c33c77a7d409ddcec4805b7ad991c4
tree873168f5bad4a7d6cbf4a8e7f627d98e4c6c883b
parentc6ba3f693297fb900ad7435cc963abd2582b1176
parentb853cb9628bfbcc4017da46d5f5b46e3eba9d8c6
Merge tag 'qcom-soc-for-4.7-2' of git://git./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