Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
  staging: et131x: Remove redundant check and return statement
  staging: et131x: Mainly whitespace changes to appease checkpatch
  staging: et131x: Remove last of the forward declarations
  staging: et131x: Remove even more forward declarations
  staging: et131x: Remove yet more forward declarations
  staging: et131x: Remove more forward declarations
  staging: et131x: Remove forward declaration of et131x_adapter_setup
  staging: et131x: Remove some forward declarations
  staging: et131x: Remove unused rx_ring.recv_packet_pool
  staging: et131x: Remove call to find pci pm capability
  staging: et131x: Remove redundant et131x_reset_recv() call
  staging: et131x: Remove unused rx_ring.recv_buffer_pool
  Staging: bcm: Fix three initialization errors in InterfaceDld.c
  Staging: bcm: Fix coding style issues in InterfaceDld.c
  staging:iio:dac: Add AD5360 driver
  staging:iio:trigger:bfin-timer: Fix compile error
  Staging: vt6655: add some range checks before memcpy()
  Staging: vt6655: whitespace fixes to iotcl.c
  Staging: vt6656: add some range checks before memcpy()
  Staging: vt6656: whitespace cleanups in ioctl.c
  ...

Fix up conflicts in:
 - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
	vg driver movement
 - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
	driver removal vs now stale changes
 - drivers/staging/rtl8192e/r8192E_core.c:
	driver removal vs now stale changes
 - drivers/staging/et131x/et131*:
	driver consolidation into one file, tried to do fixups

1 files changed, 13 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 566ab1c23a3d..27af9c95ef41 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6171,7 +6171,7 @@ S:	Maintained
 
 STAGING SUBSYSTEM
 M:      Greg Kroah-Hartman <gregkh@suse.de>
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 L:      devel@driverdev.osuosl.org
 S:      Maintained
 F:      drivers/staging/
@@ -6212,6 +6212,11 @@ M:	David Rowe <david@rowetel.com>
 S:      Odd Fixes
 F:      drivers/staging/echo/
 
+STAGING - ET131X NETWORK DRIVER
+M:      Mark Einon <mark.einon@gmail.com>
+S:      Odd Fixes
+F:      drivers/staging/et131x/
+
 STAGING - FLARION FT1000 DRIVERS
 M:      Marek Belisko <marek.belisko@gmail.com>
 S:      Odd Fixes
@@ -6240,6 +6245,13 @@ W:	http://www.lirc.org/
 S:      Odd Fixes
 F:      drivers/staging/lirc/
 
+STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
+M:      Julian Andres Klode <jak@jak-linux.org>
+M:      Marc Dietrich <marvin24@gmx.de>
+L:      ac100@lists.launchpad.net (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/staging/nvec/
+
 STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 M:      Andres Salomon <dilinger@queued.net>
 M:      Chris Ball <cjb@laptop.org>