Merge tag 'tegra-for-4.12-misc' of...

Merge tag 'tegra-for-4.12-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/fixes-non-critical

ARM: tegra: Maintainer changes for v4.12-rc1

Stephen has been focussing on other areas of the open source community
within NVIDIA, but Jon has been helping out with the kernel development
for a while now. Replace Stephen's entry with one from Jon.

Secondly, Alex has unfortunately left the company and therefore won't
be serving as a Tegra maintainer any longer.

* tag 'tegra-for-4.12-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  MAINTAINERS: tegra: Remove self as maintainer
  MAINTAINERS: tegra: Replace Stephen with Jon
Signed-off-by: Olof Johansson <olof@lixom.net>

MAINTAINERS

@@ -12298,9 +12298,8 @@ S:	Maintained
 F:	drivers/media/rc/ttusbir.c
 
 TEGRA ARCHITECTURE SUPPORT
-M:	Stephen Warren <swarren@wwwdotorg.org>
 M:	Thierry Reding <thierry.reding@gmail.com>
-M:	Alexandre Courbot <gnurou@gmail.com>
+M:	Jonathan Hunter <jonathanh@nvidia.com>
 L:	linux-tegra@vger.kernel.org
 Q:	http://patchwork.ozlabs.org/project/linux-tegra/list/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git