Merge branch 'staging'

chunkeey · Dec 12, 2016 · f899fb7 · f899fb7
2 parents ab8472b + 88d9399
commit f899fb7
Show file tree

Hide file tree

Showing 1,009 changed files with 20,933 additions and 26,548 deletions.
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
@@ -190,6 +190,14 @@ config KERNEL_MAGIC_SYSRQ
 	bool "Compile the kernel with SysRq support"
 	default y
 
+config KERNEL_DEBUG_PINCTRL
+	bool "Compile the kernel with pinctrl debugging"
+	select KERNEL_DEBUG_KERNEL
+
+config KERNEL_DEBUG_GPIO
+	bool "Compile the kernel with gpio debugging"
+	select KERNEL_DEBUG_KERNEL
+
 config KERNEL_COREDUMP
 	bool
 

diff --git a/docs/.gitignore b/docs/.gitignore
diff --git a/docs/Makefile b/docs/Makefile