Merge 3.0-rc7 into drm-core-next

This pulls in all the drm fixes up to this point which are needed for some -next patches to work.
2011-07-13 08:30:11 +01:00
parent 58b6542b50 620917de59
commit cf056edbbe
679 changed files with 30158 additions and 4054 deletions
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -34,6 +34,7 @@
 #include <linux/module.h>
 #include <linux/mman.h>
 #include <linux/pagemap.h>
+#include <linux/shmem_fs.h>
 #include "drmP.h"

 /** @file drm_gem.c