From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 23 Apr 2016 20:10:48 +0000 (+0200)
Subject: Merge tag 'qcom-fixes-for-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.6-rc6~24^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=92f27f98ceb2d457c97cb032349bbf2f776420d0;p=karo-tx-linux.git

Merge tag 'qcom-fixes-for-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes

Merge "Qualcomm Fixes for v4.6-rc2" from Andy Gross:

* Revert BAM usage on MSM8974 boards

* tag 'qcom-fixes-for-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  Revert "dts: msm8974: Add dma channels for blsp2_i2c1 node"
  Revert "dts: msm8974: Add blsp2_bam dma node"
---

92f27f98ceb2d457c97cb032349bbf2f776420d0