The following commit has been merged in the linux branch: commit b25eaebc6c5072164fef6f288a3e93241cc78bb7 Merge: c3da31485f074a6f598b67045b08e2e15d908310 0af49167b1e5ba154e90d2c454bf4624ee47df80 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 15 15:05:20 2009 -0700

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>