Merge branch 'maintainers' of git://gitorious.org/linux-davinci/linux-davinci into...

* 'maintainers' of git://gitorious.org/linux-davinci/linux-davinci: (2 commits)
  MAINTAINERS: add TI DaVinci git tree information
  MAINTAINERS: mark TI DaVinci list as "moderated"

(also included an update to 3.3-rc6)

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined MAINTAINERS
index 086c54b25d2b1bc83f3b7444fa84c73fb78a6b01,9b643d63c60fda668bfbe5ebac5184ac81049f70..b0e8362595aba3f9ee19646563bbc2c5350aae2b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -784,6 -784,7 +784,6 @@@ M: Sascha Hauer <kernel@pengutronix.de
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
 -F:    arch/arm/mach-mx*/
  F:    arch/arm/mach-imx/
  F:    arch/arm/plat-mxc/
  
@@@ -3779,7 -3780,7 +3779,7 @@@ F:      Documentation/kdump
  
  KERNEL AUTOMOUNTER v4 (AUTOFS4)
  M:    Ian Kent <raven@themaw.net>
- L:    autofs@linux.kernel.org
+ L:    autofs@vger.kernel.org
  S:    Maintained
  F:    fs/autofs4/
  
@@@ -4684,7 -4685,7 +4684,7 @@@ NTFS FILESYSTE
  M:    Anton Altaparmakov <anton@tuxera.com>
  L:    linux-ntfs-dev@lists.sourceforge.net
  W:    http://www.tuxera.com/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
  S:    Supported
  F:    Documentation/filesystems/ntfs.txt
  F:    fs/ntfs/
@@@ -5981,7 -5982,8 +5981,8 @@@ F:      arch/arm/mach-s3c2410/bast-irq.
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <nsekhar@ti.com>
  M:    Kevin Hilman <khilman@ti.com>
- L:    davinci-linux-open-source@linux.davincidsp.com (subscribers-only)
+ L:    davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
+ T:    git git://gitorious.org/linux-davinci/linux-davinci.git
  Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
  F:    arch/arm/mach-davinci
@@@ -7270,7 -7272,7 +7271,7 @@@ WATCHDOG DEVICE DRIVER
  M:    Wim Van Sebroeck <wim@iguana.be>
  L:    linux-watchdog@vger.kernel.org
  W:    http://www.linux-watchdog.org/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
+ T:    git git://www.linux-watchdog.org/linux-watchdog.git
  S:    Maintained
  F:    Documentation/watchdog/
  F:    drivers/watchdog/