Merge branches 'misc' and 'sa1111-base' into for-linus

2016-10-06 08:56:43 +01:00
parent b828f96021 b60752f2b2
commit 301a36fa70
1370 changed files with 15622 additions and 8152 deletions
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -1,6 +1,8 @@
 #ifndef __CPUHOTPLUG_H
 #define __CPUHOTPLUG_H

+#include <linux/types.h>
+
 enum cpuhp_state {
 	CPUHP_OFFLINE,
 	CPUHP_CREATE_THREADS,