Merge branches 'upstream' and 'upstream-fixes' into for-linus

2010-10-23 22:44:36 +02:00
parent 35da7a307c 569b10a506 cb174681a9
commit c3d9d74336
13 changed files with 174 additions and 98 deletions
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -570,6 +570,8 @@ void hid_debug_event(struct hid_device *hdev, char *buf)
 				buf[i];
 		list->tail = (list->tail + i) % HID_DEBUG_BUFSIZE;
        }
+
+	wake_up_interruptible(&hdev->debug_wait);
 }
 EXPORT_SYMBOL_GPL(hid_debug_event);