Merge commit 'v2.6.32' into next

2009-12-02 23:38:13 -08:00
parent 66d2a5952e 22763c5cf3
commit 467832032c
799 changed files with 13347 additions and 6187 deletions
--- a/include/linux/input.h
+++ b/include/linux/input.h
@ -1389,6 +1389,10 @@ extern struct class input_class;
 * methods; erase() is optional. set_gain() and set_autocenter() need
 * only be implemented if driver sets up FF_GAIN and FF_AUTOCENTER
 * bits.
+ *
+ * Note that playback(), set_gain() and set_autocenter() are called with
+ * dev->event_lock spinlock held and interrupts off and thus may not
+ * sleep.
 */
 struct ff_device {
 	int (*upload)(struct input_dev *dev, struct ff_effect *effect,