Merge tag 'tegra-for-3.7-maintainers' of git://git.kernel.org/pub/scm/linux/kernel...

* 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

diff --combined MAINTAINERS
index 5f3e6c63b28342969c556929a6802a33a1553161,7c9fdb0e29743b991ed091e6353af6658f6a1987..95e66a420a203729ce22bf7511f2548f2f8a3b7d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -827,24 -827,24 +827,24 @@@ F:      arch/arm/mach-pxa/colibri-pxa270-inc
  
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
- M:    Dan Williams <dan.j.williams@intel.com>
+ M:    Dan Williams <djbw@fb.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IOP33X ARM ARCHITECTURE
- M:    Dan Williams <dan.j.williams@intel.com>
+ M:    Dan Williams <djbw@fb.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IOP13XX ARM ARCHITECTURE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
- M:    Dan Williams <dan.j.williams@intel.com>
+ M:    Dan Williams <djbw@fb.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
- M:    Dan Williams <dan.j.williams@intel.com>
+ M:    Dan Williams <djbw@fb.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
@@@ -869,7 -869,7 +869,7 @@@ F: drivers/pcmcia/pxa2xx_stargate2.
  
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
- M:    Dan Williams <dan.j.williams@intel.com>
+ M:    Dan Williams <djbw@fb.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
@@@ -913,12 -913,6 +913,12 @@@ W:       http://www.digriz.org.uk/ts78xx/kern
  S:    Maintained
  F:    arch/arm/mach-orion5x/ts78xx-*
  
 +ARM/MICREL KS8695 ARCHITECTURE
 +M:    Greg Ungerer <gerg@uclinux.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +F:    arch/arm/mach-ks8695
 +S:    Odd Fixes
 +
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <robert.jarzmik@free.fr>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -931,14 -925,14 +931,14 @@@ S:      Maintaine
  
  ARM/NOMADIK ARCHITECTURE
  M:    Alessandro Rubini <rubini@unipv.it>
- M:    Linus Walleij <linus.walleij@stericsson.com>
+ M:    Linus Walleij <linus.walleij@linaro.org>
  M:    STEricsson <STEricsson_nomadik_linux@list.st.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-nomadik/
  F:    arch/arm/plat-nomadik/
  F:    drivers/i2c/busses/i2c-nomadik.c
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
  
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  M:    Nelson Castillo <arhuaco@freaks-unidos.net>
@@@ -1152,7 -1146,7 +1152,7 @@@ F:      drivers/usb/host/ehci-w90x900.
  F:    drivers/video/nuc900fb.c
  
  ARM/U300 MACHINE SUPPORT
- M:    Linus Walleij <linus.walleij@stericsson.com>
+ M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm/mach-u300/
@@@ -1167,15 -1161,20 +1167,20 @@@ T:   git git://git.kernel.org/pub/scm/lin
  
  ARM/Ux500 ARM ARCHITECTURE
  M:    Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
- M:    Linus Walleij <linus.walleij@stericsson.com>
+ M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-ux500/
+ F:    drivers/clocksource/clksrc-dbx500-prcmu.c
  F:    drivers/dma/ste_dma40*
+ F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/mfd/abx500*
  F:    drivers/mfd/ab8500*
- F:    drivers/mfd/stmpe*
+ F:    drivers/mfd/dbx500*
+ F:    drivers/mfd/db8500*
+ F:    drivers/pinctrl/pinctrl-nomadik*
  F:    drivers/rtc/rtc-ab8500.c
+ F:    drivers/rtc/rtc-pl031.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
  
  ARM/VFP SUPPORT
@@@ -1233,9 -1232,9 +1238,9 @@@ S:      Maintaine
  F:    drivers/hwmon/asb100.c
  
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
- M:    Dan Williams <dan.j.williams@intel.com>
+ M:    Dan Williams <djbw@fb.com>
  W:    http://sourceforge.net/projects/xscaleiop
- S:    Supported
+ S:    Maintained
  F:    Documentation/crypto/async-tx-api.txt
  F:    crypto/async_tx/
  F:    drivers/dma/
@@@ -2218,7 -2217,7 +2223,7 @@@ S:      Maintaine
  F:    drivers/scsi/tmscsim.*
  
  DC395x SCSI driver
- M:    Oliver Neukum <oliver@neukum.name>
+ M:    Oliver Neukum <oliver@neukum.org>
  M:    Ali Akcaagac <aliakc@web.de>
  M:    Jamie Lenehan <lenehan@twibble.org>
  W:    http://twibble.org/dist/dc395x/
@@@ -2365,7 -2364,7 +2370,7 @@@ T:      git git://git.linaro.org/people/sumi
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <vinod.koul@intel.com>
- M:    Dan Williams <dan.j.williams@intel.com>
+ M:    Dan Williams <djbw@fb.com>
  S:    Supported
  F:    drivers/dma/
  F:    include/linux/dma*
@@@ -3100,7 -3099,7 +3105,7 @@@ F:      include/linux/gigaset_dev.
  
  GPIO SUBSYSTEM
  M:    Grant Likely <grant.likely@secretlab.ca>
- M:    Linus Walleij <linus.walleij@stericsson.com>
+ M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  F:    Documentation/gpio.txt
@@@ -3553,7 -3552,6 +3558,6 @@@ K:      \b(ABS|SYN)_MT
  
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <intel-linux-scu@intel.com>
- M:    Dan Williams <dan.j.williams@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
  M:    Ed Nadolski <edmund.nadolski@intel.com>
  L:    linux-scsi@vger.kernel.org
@@@ -3596,8 -3594,8 +3600,8 @@@ F:      arch/x86/kernel/microcode_core.
  F:    arch/x86/kernel/microcode_intel.c
  
  INTEL I/OAT DMA DRIVER
- M:    Dan Williams <dan.j.williams@intel.com>
- S:    Supported
+ M:    Dan Williams <djbw@fb.com>
+ S:    Maintained
  F:    drivers/dma/ioat*
  
  INTEL IOMMU (VT-d)
@@@ -3609,8 -3607,8 +3613,8 @@@ F:      drivers/iommu/intel-iommu.
  F:    include/linux/intel-iommu.h
  
  INTEL IOP-ADMA DMA DRIVER
- M:    Dan Williams <dan.j.williams@intel.com>
- S:    Maintained
+ M:    Dan Williams <djbw@fb.com>
+ S:    Odd fixes
  F:    drivers/dma/iop-adma.c
  
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
@@@ -4539,7 -4537,7 +4543,7 @@@ S:      Supporte
  F:    arch/microblaze/
  
  MICROTEK X6 SCANNER
- M:    Oliver Neukum <oliver@neukum.name>
+ M:    Oliver Neukum <oliver@neukum.org>
  S:    Maintained
  F:    drivers/usb/image/microtek.*
  
@@@ -5335,14 -5333,15 +5339,15 @@@ PIN CONTROL SUBSYSTE
  M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
  F:    drivers/pinctrl/
+ F:    include/linux/pinctrl/
  
  PIN CONTROLLER - ST SPEAR
- M:     Viresh Kumar <viresh.linux@gmail.com>
+ M:    Viresh Kumar <viresh.linux@gmail.com>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
- F:    driver/pinctrl/spear/
+ F:    drivers/pinctrl/spear/
  
  PKTCDVD DRIVER
  M:    Peter Osterlund <petero2@telia.com>
@@@ -6777,14 -6776,14 +6782,14 @@@ F:   drivers/net/team
  F:    include/linux/if_team.h
  
  TEGRA SUPPORT
- M:    Colin Cross <ccross@android.com>
- M:    Olof Johansson <olof@lixom.net>
  M:    Stephen Warren <swarren@wwwdotorg.org>
  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/swarren/linux-tegra.git
  S:    Supported
  F:    arch/arm/mach-tegra
+ F:    arch/arm/boot/dts/tegra*
+ F:    arch/arm/configs/tegra_defconfig
  
  TEHUTI ETHERNET DRIVER
  M:    Andy Gospodarek <andy@greyhouse.net>
@@@ -7077,7 -7076,7 +7082,7 @@@ F:      include/linux/mtd/ubi.
  F:    include/mtd/ubi-user.h
  
  USB ACM DRIVER
- M:    Oliver Neukum <oliver@neukum.name>
+ M:    Oliver Neukum <oliver@neukum.org>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    Documentation/usb/acm.txt
@@@ -7098,7 -7097,7 +7103,7 @@@ S:      Supporte
  F:    drivers/block/ub.c
  
  USB CDC ETHERNET DRIVER
- M:    Oliver Neukum <oliver@neukum.name>
+ M:    Oliver Neukum <oliver@neukum.org>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    drivers/net/usb/cdc_*.c
@@@ -7171,7 -7170,7 +7176,7 @@@ F:      drivers/usb/host/isp116x
  F:    include/linux/usb/isp116x.h
  
  USB KAWASAKI LSI DRIVER
- M:    Oliver Neukum <oliver@neukum.name>
+ M:    Oliver Neukum <oliver@neukum.org>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    drivers/usb/serial/kl5kusb105.*
@@@ -7289,6 -7288,12 +7294,12 @@@ W:    http://www.connecttech.co
  S:    Supported
  F:    drivers/usb/serial/whiteheat*
  
+ USB SMSC75XX ETHERNET DRIVER
+ M:    Steve Glendinning <steve.glendinning@shawell.net>
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ F:    drivers/net/usb/smsc75xx.*
+ 
  USB SMSC95XX ETHERNET DRIVER
  M:    Steve Glendinning <steve.glendinning@shawell.net>
  L:    netdev@vger.kernel.org
@@@ -7671,23 -7676,28 +7682,28 @@@ S:   Supporte
  F:    Documentation/hwmon/wm83??
  F:    arch/arm/mach-s3c64xx/mach-crag6410*
  F:    drivers/clk/clk-wm83*.c
+ F:    drivers/extcon/extcon-arizona.c
  F:    drivers/leds/leds-wm83*.c
  F:    drivers/gpio/gpio-*wm*.c
+ F:    drivers/gpio/gpio-arizona.c
  F:    drivers/hwmon/wm83??-hwmon.c
  F:    drivers/input/misc/wm831x-on.c
  F:    drivers/input/touchscreen/wm831x-ts.c
  F:    drivers/input/touchscreen/wm97*.c
- F:    drivers/mfd/wm8*.c
+ F:    drivers/mfd/arizona*
+ F:    drivers/mfd/wm*.c
  F:    drivers/power/wm83*.c
  F:    drivers/rtc/rtc-wm83*.c
  F:    drivers/regulator/wm8*.c
  F:    drivers/video/backlight/wm83*_bl.c
  F:    drivers/watchdog/wm83*_wdt.c
+ F:    include/linux/mfd/arizona/
  F:    include/linux/mfd/wm831x/
  F:    include/linux/mfd/wm8350/
  F:    include/linux/mfd/wm8400*
  F:    include/linux/wm97xx.h
  F:    include/sound/wm????.h
+ F:    sound/soc/codecs/arizona.?
  F:    sound/soc/codecs/wm*
  
  WORKQUEUE