tree bdb9dc5c995700fa226d4edc8519fb8eb20e5f30
parent 11f52002bfb4ceef26f04ab46cabd37e90f6b1ed
parent 6f0a4d0c26f17e93f296e43c7b9f44733ea188ae
author Arnd Bergmann <arnd@arndb.de> 1431532479 +0200
committer Arnd Bergmann <arnd@arndb.de> 1431532479 +0200
mergetag object 6f0a4d0c26f17e93f296e43c7b9f44733ea188ae
 type commit
 tag tegra-for-4.2-memory
 tagger Thierry Reding <treding@nvidia.com> 1431523345 +0200
 
 ARM: tegra: Memory controller updates for v4.2-rc1
 
 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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJVU1AnAAoJEN0jrNd/PrOhWI8P/jqbjvaCbsbVciS4myB8xYhP
 A4pny5L38xmz6ngKliBEfW10nwq2JsH+dKAlXzRYMej4QghKjVrVzY2AtYQ3v5wv
 MeUx+yJTA54PxRHnI+dAiD7ak8ZswKsFADSVxbbOVHmI+4LQ9PAryW1lhQqikP+8
 FzVXWzNrCh1Ikv9qiOYimbKycCYVwzf1cpOnaYgDt+WRfCZBYRaVP2KdTblgC8yu
 BM2FiPoWUKdB+YCMYJB7qJtfZOe+lF6lUA8nUVaydnW3F9ll+fCnG/Ypk1iRkXr7
 rrAW6IIvkvlLpxb4o27QkuSZYNEvjwbpNAfYEocZ7v/bLAa1Knwjj3MUItgE6MFp
 zZuZ0bJ135DvGvNmkPpq3bK8c+iDsqqW2XjmHY6DCSDS9rYzyvu9b37XOYsV9HVr
 iMY3Zd8gjrtzMwiE3xLaGxaz20osuWLU4JbOHHRVpgf2u5AWGEfN/kdO+ZJlerFG
 7Z3t8svJaGaHB0EICvRxx/1dcnyW/FAS/7GC2Pb3afHBlqmxXdHa6cGzpbFlmEfz
 miYgVlEZziJXL+MsUPNHUoupSe9jo/oxm8YOIXR7z9pI9Xg2OWOxhv0afG+i1Y/a
 AniEnEmeon+wmL0699bDCvvtEEyRW+k2/mT9xp/M9Nr48DLRHYRVuiNYXd/wAk1t
 xu63NH9f+I/4pMb1H+Za
 =86m4
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.2-memory' of git://git.kernel.org/pub/scm/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