| commit | a4d7749be5de4a7261bcbe3c7d96c748792ec455 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 10 10:49:53 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 10 10:49:53 2009 -0700 |
| tree | 0a38d9a679b063fb17776ba109018a6d66bf97a1 | |
| parent | 6580cd59f9d11b62ebef5b27662bdc1fdf34eb64 [diff] | |
| parent | ca9fc928788a02a0fe975dc3334e6d7ec521b6af [diff] |
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()