Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp

Conflicts:
	arch/arm/plat-omap/dmtimer.c

1 files changed, 1 insertions, 1 deletions

diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index cb1f50cf12e3..7f6425e24ce3 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -409,7 +409,7 @@ static void traps(void)
         int *p = (int *)test;
 
         if (*p != INT_CONF) {
-                fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
+                fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianness? %#x\n",
                         *p);
                 exit(2);
         }