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: (342 commits)
  Staging: comedi: fix build errors
  Staging: udlfb: update to version 0.2.3
  Staging: udlfb: fix some sparse warnings.
  Staging: udlfb: clean up checkpatch warnings in udlfb.c
  Staging: udlfb: clean up checkpatch warnings in udlfb.h
  Staging: udlfb: add udlfb driver to build
  Staging: add udlfb driver
  Staging: pata_rdc: remove pointless comments
  Staging: pata_rdc: remove DRIVER macros
  Staging: pata_rdc: remove dbgprintf macro
  Staging: pata_rdc: remove broken flag
  Staging: pata_rdc: fix build warnings
  Staging: pata_rdc: use PCI_DEVICE
  Staging: pata_rdc: remove function prototypes
  Staging: pata_rdc: coding style fixes
  Staging: pata_rdc: convert code to work in 2.6.29
  Staging: pata_rdc: add driver to the build system
  Staging: add pata_rdc driver
  Staging: remove obsolete serqt_usb driver
  Staging: serqt_usb2 add the driver to the build
  ...

diff --combined MAINTAINERS
index a08882e,1e14f7b..dc226e7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -946,7 -946,7 +946,7 @@@ M: me@bobcopeland.co
  L:    linux-wireless@vger.kernel.org
  L:    ath5k-devel@lists.ath5k.org
  S:    Maintained
 -F:    drivers/net/wireless/ath5k/
 +F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH9K WIRELESS DRIVER
  P:    Luis R. Rodriguez
@@@ -962,7 -962,7 +962,7 @@@ M: senthilkumar@atheros.co
  L:    linux-wireless@vger.kernel.org
  L:    ath9k-devel@lists.ath9k.org
  S:    Supported
 -F:    drivers/net/wireless/ath9k/
 +F:    drivers/net/wireless/ath/ath9k/
  
  ATHEROS AR9170 WIRELESS DRIVER
  P:    Christian Lamparter
@@@ -970,7 -970,7 +970,7 @@@ M: chunkeey@web.d
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/ar9170
  S:    Maintained
 -F:    drivers/net/wireless/ar9170/
 +F:    drivers/net/wireless/ath/ar9170/
  
  ATI_REMOTE2 DRIVER
  P:    Ville Syrjala
@@@ -2053,8 -2053,8 +2053,8 @@@ F:      drivers/edac/i5400_edac.
  
  EDAC-I82975X
  P:    Ranganathan Desikan
 -P:    Arvind R.
  M:    rdesikan@jetzbroadband.com
 +P:    Arvind R.
  M:    arvind@acarlab.com
  L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
@@@ -2390,7 -2390,7 +2390,7 @@@ FTRAC
  P:    Steven Rostedt
  M:    rostedt@goodmis.org
  S:    Maintained
 -F:    Documentation/ftrace.txt
 +F:    Documentation/trace/ftrace.txt
  F:    arch/*/*/*/ftrace.h
  F:    arch/*/kernel/ftrace.c
  F:    include/*/ftrace.h
@@@ -2849,7 -2849,7 +2849,7 @@@ W:      http://apps.sourceforge.net/trac/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git
  S:    Maintained
  F:    net/ieee802154/
 -F:    drivers/ieee801254/
 +F:    drivers/ieee802154/
  
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
  P:    Mimi Zohar
@@@ -3406,7 -3406,7 +3406,7 @@@ P:      Eduard - Gabriel Muntean
  M:    eduard.munteanu@linux360.ro
  S:    Maintained
  F:    Documentation/trace/kmemtrace.txt
 -F:    include/trace/kmemtrace.h
 +F:    include/linux/kmemtrace.h
  F:    kernel/trace/kmemtrace.c
  
  KPROBES
@@@ -4083,7 -4083,7 +4083,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    net/wireless/
  F:    include/net/ieee80211*
 -F:    include/net/wireless.h
 +F:    include/linux/wireless.h
  
  NETWORKING DRIVERS
  L:    netdev@vger.kernel.org
@@@ -5479,6 -5479,7 +5479,7 @@@ STAGING SUBSYSTE
  P:    Greg Kroah-Hartman
  M:    gregkh@suse.de
  T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+ L:    devel@driverdev.osuosl.org
  S:    Maintained
  F:    drivers/staging/