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/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/list.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/virtio.h>
 #include <linux/virtio_config.h>