Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 May 2009 17:49:53 +0000 (10:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 May 2009 17:49:53 +0000 (10:49 -0700)
commita4d7749be5de4a7261bcbe3c7d96c748792ec455
tree0a38d9a679b063fb17776ba109018a6d66bf97a1
parent6580cd59f9d11b62ebef5b27662bdc1fdf34eb64
parentca9fc928788a02a0fe975dc3334e6d7ec521b6af
Merge git://git./linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: comedi: David doesn't want to get comedi patches
  Staging: rtl8187se: Fix compilation warnings and procfs directory leak
  Staging: rt2870: new device id
  Staging: w35und: unregister device from the ieee80211 stack upon ->disconnect()