From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 10 May 2009 17:49:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
X-Git-Tag: v2.6.30-rc6~41
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a4d7749be5de4a7261bcbe3c7d96c748792ec455;p=~shefty%2Frdma-dev.git

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:
  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()
---

a4d7749be5de4a7261bcbe3c7d96c748792ec455