Commit 26e9a397 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents bdbf0ac7 99e06e37

Documentation/sysctl/kernel.txt

+1 −0
Original line number Diff line number Diff line
@@ -369,4 +369,5 @@ can be ORed together: 
  2 - A module was force loaded by insmod -f.

      Set by modutils >= 2.4.9 and module-init-tools.

  4 - Unsafe SMP processors: SMP with CPUs not designed for SMP.

 64 - A module from drivers/staging was loaded.

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -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

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -101,4 +101,6 @@ source "drivers/auxdisplay/Kconfig" 
source "drivers/uio/Kconfig"



source "drivers/xen/Kconfig"



source "drivers/staging/Kconfig"

endmenu

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -99,3 +99,4 @@ obj-$(CONFIG_OF) += of/ 
obj-$(CONFIG_SSB)		+= ssb/

obj-$(CONFIG_VIRTIO)		+= virtio/

obj-$(CONFIG_REGULATOR)		+= regulator/

obj-$(CONFIG_STAGING)		+= staging/

drivers/staging/Kconfig

0 → 100644
+46 −0
Original line number Diff line number Diff line 
menuconfig STAGING

	bool "Staging drivers"

	default n

	---help---

	  This option allows you to select a number of drivers that are

	  not of the "normal" Linux kernel quality level.  These drivers

	  are placed here in order to get a wider audience for use of

	  them.  Please note that these drivers are under heavy

	  development, may or may not work, and may contain userspace

	  interfaces that most likely will be changed in the near

	  future.



	  Using any of these drivers will taint your kernel which might

	  affect support options from both the community, and various

	  commercial support orginizations.



	  If you wish to work on these drivers, to help improve them, or

	  to report problems you have with them, please see the

	  driver_name.README file in the drivers/staging/ directory to

	  see what needs to be worked on, and who to contact.



	  If in doubt, say N here.



if STAGING



source "drivers/staging/et131x/Kconfig"



source "drivers/staging/slicoss/Kconfig"



source "drivers/staging/sxg/Kconfig"



source "drivers/staging/me4000/Kconfig"



source "drivers/staging/go7007/Kconfig"



source "drivers/staging/usbip/Kconfig"



source "drivers/staging/winbond/Kconfig"



source "drivers/staging/wlan-ng/Kconfig"



source "drivers/staging/echo/Kconfig"



source "drivers/staging/at76_usb/Kconfig"



endif # STAGING

CRA Git | Maintained and supported by SUSTech CRA and CCSE