Merge tag 'tegra-for-3.7-maintainers' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 01:50:30 +0000 (18:50 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 17 Sep 2012 01:50:30 +0000 (18:50 -0700)
* tag 'tegra-for-3.7-maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  MAINTAINERS: tegra: remove Olof/Colin, add device tree files
  MAINTAINERS: add defconfig file to TEGRA section
  + sync with 3.6-rc4

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge