Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup

From Michal Simek:

* 'arm-next' of git://git.xilinx.com/linux-xlnx:
  zynq: move static peripheral mappings
  zynq: remove use of CLKDEV_LOOKUP
  zynq: use pl310 device tree bindings
  zynq: use GIC device tree bindings
  + Linux 3.7-rc3

1 files changed, 38 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 9f78c28a848b..69bf316281f6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -235,6 +235,7 @@ F:	drivers/platform/x86/acer-wmi.c
 
 ACPI
 M:      Len Brown <lenb@kernel.org>
+M:      Rafael J. Wysocki <rjw@sisk.pl>
 L:      linux-acpi@vger.kernel.org
 W:      http://www.lesswatts.org/projects/acpi/
 Q:      http://patchwork.kernel.org/project/linux-acpi/list/
@@ -636,6 +637,13 @@ W:	http://www.arm.linux.org.uk/
 S:      Maintained
 F:      arch/arm/
 
+ARM SUB-ARCHITECTURES
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      MAINTAINED
+F:      arch/arm/mach-*/
+F:      arch/arm/plat-*/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
+
 ARM PRIMECELL AACI PL041 DRIVER
 M:      Russell King <linux@arm.linux.org.uk>
 S:      Maintained
@@ -2800,6 +2808,7 @@ F:	sound/usb/misc/ua101.c
 EXTENSIBLE FIRMWARE INTERFACE (EFI)
 M:      Matt Fleming <matt.fleming@intel.com>
 L:      linux-efi@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
 S:      Maintained
 F:      Documentation/x86/efi-stub.txt
 F:      arch/ia64/kernel/efi.c
@@ -4371,7 +4380,7 @@ F:	Documentation/scsi/53c700.txt
 F:      drivers/scsi/53c700*
 
 LED SUBSYSTEM
-M:      Bryan Wu <bryan.wu@canonical.com>
+M:      Bryan Wu <cooloney@gmail.com>
 M:      Richard Purdie <rpurdie@rpsys.net>
 L:      linux-leds@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
@@ -5018,6 +5027,20 @@ F:	net/ipv6/
 F:      include/net/ip*
 F:      arch/x86/net/*
 
+NETWORKING [IPSEC]
+M:      Steffen Klassert <steffen.klassert@secunet.com>
+M:      Herbert Xu <herbert@gondor.apana.org.au>
+M:      "David S. Miller" <davem@davemloft.net>
+L:      netdev@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+S:      Maintained
+F:      net/xfrm/
+F:      net/key/
+F:      net/ipv4/xfrm*
+F:      net/ipv6/xfrm*
+F:      include/uapi/linux/xfrm.h
+F:      include/net/xfrm.h
+
 NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
 M:      Paul Moore <paul@paul-moore.com>
 L:      netdev@vger.kernel.org
@@ -5045,7 +5068,13 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
 S:      Odd Fixes
 F:      drivers/net/
 F:      include/linux/if_*
-F:      include/linux/*device.h
+F:      include/linux/netdevice.h
+F:      include/linux/arcdevice.h
+F:      include/linux/etherdevice.h
+F:      include/linux/fcdevice.h
+F:      include/linux/fddidevice.h
+F:      include/linux/hippidevice.h
+F:      include/linux/inetdevice.h
 
 NETXEN (1/10) GbE SUPPORT
 M:      Sony Chacko <sony.chacko@qlogic.com>
@@ -7730,6 +7759,13 @@ W:	http://www.ideasonboard.org/uvc/
 S:      Maintained
 F:      drivers/media/usb/uvc/
 
+USB WEBCAM GADGET
+M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:      linux-usb@vger.kernel.org
+S:      Maintained
+F:      drivers/usb/gadget/*uvc*.c
+F:      drivers/usb/gadget/webcam.c
+
 USB WIRELESS RNDIS DRIVER (rndis_wlan)
 M:      Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
 L:      linux-wireless@vger.kernel.org