Merge commit 'linus/master' into HEAD

Conflicts:
	MAINTAINERS

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 8912c0f5460b..72c15205bb2b 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -373,10 +373,11 @@ void print_deps(void)
 void traps(void)
 {
         static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
+        int *p = (int *)test;
 
-        if (*(int *)test != INT_CONF) {
+        if (*p != INT_CONF) {
                 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-                        *(int *)test);
+                        *p);
                 exit(2);
         }
 }