Merge branch 'linus' into sched/core

Merge reason: merge the latest fixes, update to -rc4. Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-04-15 09:35:24 +02:00
parent 371fd7e7a5 2ba3abd818
commit b257c14ceb
4545 changed files with 23852 additions and 3896 deletions
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -10,6 +10,7 @@
 */
 #include <linux/module.h>
 #include <linux/cred.h>
+#include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/key.h>
 #include <linux/keyctl.h>