Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (25 commits)
  staging: at76_usb wireless driver
  Staging: workaround build system bug
  Staging: Lindent sxg.c
  Staging: SLICOSS: Call pci_release_regions at driver exit
  Staging: SLICOSS: Fix remaining type names
  Staging: SLICOSS: Fix warnings due to static usage
  Staging: SLICOSS: lots of checkpatch fixes
  Staging: go7007 v4l fixes
  Staging: Fix gcc warnings in sxg
  Staging: add echo cancelation module
  Staging: add wlan-ng prism2 usb driver
  Staging: add w35und wifi driver
  Staging: USB/IP: add host driver
  Staging: USB/IP: add client driver
  Staging: USB/IP: add common functions needed
  Staging: add the go7007 video driver
  Staging: add me4000 pci data collection driver
  Staging: add me4000 firmware files
  Staging: add sxg network driver
  Staging: add Alacritech slicoss network driver
  ...

Fixed up conflicts due to taint flags changes and MAINTAINERS cleanup in
MAINTAINERS, include/linux/kernel.h and kernel/panic.c.

1 files changed, 8 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 52702b057c0..355c192d699 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3937,7 +3937,7 @@ M:	jbglaw@lug-owl.de
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
-STABLE BRANCH:
+STABLE BRANCH
 P:      Greg Kroah-Hartman
 M:      greg@kroah.com
 P:      Chris Wright
@@ -3945,6 +3945,13 @@ M:	chrisw@sous-sol.org
 L:      stable@kernel.org
 S:      Maintained
 
+STAGING SUBSYSTEM
+P:      Greg Kroah-Hartman
+M:      gregkh@suse.de
+L:      linux-kernel@vger.kernel.org
+T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+S:      Maintained
+
 STARFIRE/DURALAN NETWORK DRIVER
 P:      Ion Badulescu
 M:      ionut@cs.columbia.edu