Merge branch 'master' into for-next

2010-04-23 02:08:44 +02:00
parent 4cb3ca7cd7 c81eddb0e3
commit 6c9468e9eb
5526 changed files with 96639 additions and 43583 deletions
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -81,6 +81,7 @@
 */
 #include <linux/init.h>
 #include <linux/spinlock.h>
+#include <linux/slab.h>
 #include <linux/hash.h>

 #include "wa-hc.h"