Merge branch 'fixes' into for-linus

2012-10-06 00:19:06 +01:00
parent ceaa1a13c0 8ef102c6b4
commit b4874a3d29
42 changed files with 509 additions and 293 deletions
--- a/arch/arm/include/asm/syscall.h
+++ b/arch/arm/include/asm/syscall.h
@@ -8,6 +8,7 @@
 #define _ASM_ARM_SYSCALL_H

 #include <linux/err.h>
+#include <linux/sched.h>

 #include <asm/unistd.h>