From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 25 Apr 2016 21:50:41 +0000 (+0200)
Subject: Merge tag 'qcom-soc-for-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agros... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d3e2442b51c33c77a7d409ddcec4805b7ad991c4;p=linux-beck.git

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
---

d3e2442b51c33c77a7d409ddcec4805b7ad991c4