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/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -27,7 +27,6 @@
 */

 #include <linux/cgroup.h>
-#include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
 #include <linux/fs.h>