diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-23 22:10:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-23 22:10:48 +0200 |
| commit | 92f27f98ceb2d457c97cb032349bbf2f776420d0 (patch) | |
| tree | 92c0e2b170ba4d1c001273631726111b2ab4f31a /arch/arm/mach-nomadik | |
| parent | 56896ef5b990a3822da45f92e548c4c8ac301bb4 (diff) | |
| parent | 10c0f0e92f019ab8d0c17da3696e35b0eef4ec16 (diff) | |
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"
Diffstat (limited to 'arch/arm/mach-nomadik')
0 files changed, 0 insertions, 0 deletions