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: (714 commits)
  Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers
  Staging: serqt_usb: fix build due to proc tty changes
  Staging: serqt_usb: fix checkpatch errors
  Staging: serqt_usb: add TODO file
  Staging: serqt_usb: Lindent the code
  Staging: add USB serial Quatech driver
  staging: document that the wifi staging drivers a bit better
  Staging: echo cleanup
  Staging: BUG to BUG_ON changes
  Staging: remove some pointless conditionals before kfree_skb()
  Staging: line6: fix build error, select SND_RAWMIDI
  Staging: line6: fix checkpatch errors in variax.c
  Staging: line6: fix checkpatch errors in toneport.c
  Staging: line6: fix checkpatch errors in pcm.c
  Staging: line6: fix checkpatch errors in midibuf.c
  Staging: line6: fix checkpatch errors in midi.c
  Staging: line6: fix checkpatch errors in dumprequest.c
  Staging: line6: fix checkpatch errors in driver.c
  Staging: line6: fix checkpatch errors in audio.c
  Staging: line6: fix checkpatch errors in pod.c
  ...

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/comedi/Kconfig
index 83a93a5c63926593a829585b8b46e735fd912f6a,6365a2023d524a363bab79742517eb3ccd352943..2d819d278b0ece94afad8f71be331180bbcd1bfb
--- 1/drivers/staging/comedi/Kconfig
--- 2/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@@ -3,9 -3,16 +3,16 @@@ config COMED
        default N
        depends on m
        ---help---
 -        Enable support a wide range of data acquision devices
 +        Enable support a wide range of data acquisition devices
          for Linux.
  
+ config COMEDI_DEBUG
+       bool "Comedi debugging"
+       depends on COMEDI != n
+       help
+         This is an option for use by developers; most people should
+         say N here. This enables comedi core and driver debugging.
+ 
  config COMEDI_RT
        tristate "Comedi Real-time support"
        depends on COMEDI && RT

diff --cc drivers/staging/otus/hal/hpmain.c
Simple merge