Merge commit 'v3.1' into devicetree/next

diff --combined MAINTAINERS
index 046526a647c4253ff97d17c50b30a9d5ab257733,6185d0513584c57a19dce35fbacec705750ad42f..73369be4c24125e337567a5d72d7112505870b94
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2460,7 -2460,7 +2460,7 @@@ S:      Supporte
  F:    drivers/infiniband/hw/ehca/
  
  EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
- M:    Breno Leitao <leitao@linux.vnet.ibm.com>
+ M:    Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ehea/
@@@ -3313,7 -3313,7 +3313,7 @@@ M:      David Woodhouse <dwmw2@infradead.org
  L:    iommu@lists.linux-foundation.org
  T:    git git://git.infradead.org/iommu-2.6.git
  S:    Supported
- F:    drivers/pci/intel-iommu.c
+ F:    drivers/iommu/intel-iommu.c
  F:    include/linux/intel-iommu.h
  
  INTEL IOP-ADMA DMA DRIVER
@@@ -4728,12 -4728,10 +4728,12 @@@ F:   drivers/i2c/busses/i2c-ocores.
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Grant Likely <grant.likely@secretlab.ca>
 +M:    Rob Herring <rob.herring@calxeda.com>
  L:    devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
  W:    http://fdt.secretlab.ca
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
 +F:    Documentation/devicetree
  F:    drivers/of
  F:    include/linux/of*.h
  K:    of_get_property
@@@ -6368,10 -6366,10 +6368,10 @@@ F:   net/ipv4/tcp_lp.
  
  TEGRA SUPPORT
  M:    Colin Cross <ccross@android.com>
- M:    Erik Gilling <konkers@android.com>
  M:    Olof Johansson <olof@lixom.net>
+ M:    Stephen Warren <swarren@nvidia.com>
  L:    linux-tegra@vger.kernel.org
- T:    git git://android.git.kernel.org/kernel/tegra.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git
  S:    Supported
  F:    arch/arm/mach-tegra