diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 15:05:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 15:05:20 -0700 |
| commit | b25eaebc6c5072164fef6f288a3e93241cc78bb7 (patch) | |
| tree | 12d272d11b97717ab87e57e1e0e994a6fe1bc86a /drivers/base | |
| parent | c3da31485f074a6f598b67045b08e2e15d908310 (diff) | |
| parent | 0af49167b1e5ba154e90d2c454bf4624ee47df80 (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: rt2860sta: prevent a panic when disabling when associated
staging: more sched.h fixes
Staging: et131x: Fix the add_10bit macro
Staging: et131x: Correct WRAP bit handling
staging: Complete sched.h removal from interrupt.h
Staging: vme: fix sched.h build breakage
Staging: poch: fix sched.h build breakage
Staging: b3dfg: fix sched.h build breakage
Staging: comedi: fix sched.h build breakage
Staging: iio: Fix missing include <linux/sched.h>
Diffstat (limited to 'drivers/base')
0 files changed, 0 insertions, 0 deletions