Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>
2018-07-20 14:45:10 -07:00
parent 40999f11ce 48e5aee81f
commit c4c5551df1
598 changed files with 5375 additions and 2972 deletions
--- a/include/linux/fsl/guts.h
+++ b/include/linux/fsl/guts.h
@@ -16,6 +16,7 @@
 #define __FSL_GUTS_H__

 #include <linux/types.h>
+#include <linux/io.h>

 /**
 * Global Utility Registers.