From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 13 May 2015 15:54:39 +0000 (+0200)
Subject: Merge tag 'tegra-for-4.2-memory' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~15559^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe7a5bfe18f06a418705098f6212bda2cbdcadb5;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'tegra-for-4.2-memory' of git://git./linux/kernel/git/tegra/linux into next/drivers

Merge "ARM: tegra: Memory controller updates for v4.2-rc1" from Thierry Reding:

Adds support for Tegra132 (which is mostly the same as for Tegra124,
except for cache maintenance). debugfs support is also introduced for
the SMMU part of the memory controller, which allows users to inspect
the translation state for SWGROUPs and memory clients.

* tag 'tegra-for-4.2-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  memory: tegra: Disable ARBITRATION_EMEM interrupt
  memory: tegra: Add Tegra132 support
  iommu/tegra-smmu: Add debugfs support
  memory: tegra: Add SWGROUP names
---

fe7a5bfe18f06a418705098f6212bda2cbdcadb5