From: Stricted <info@stricted.net>
Date: Wed, 21 Mar 2018 21:45:22 +0000 (+0100)
Subject: Merge tag 'v3.10.80' into update
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5eab7029251b5fed2d0045efcb51602857007f4a;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge tag 'v3.10.80' into update

This is the 3.10.80 stable release
---

5eab7029251b5fed2d0045efcb51602857007f4a
diff --cc Makefile
index f6548c343572,067433219984..2a1fc8777d7a
--- a/Makefile
+++ b/Makefile
@@@ -374,7 -374,7 +374,7 @@@ KBUILD_CFLAGS   := -Wall -Wundef -Wstri
  		   -Werror-implicit-function-declaration \
  		   -Wno-format-security \
  		   -fno-delete-null-pointer-checks \
- 		   -w
 -		   -std=gnu89
++		   -w -std=gnu89
  
  KBUILD_AFLAGS_KERNEL :=
  KBUILD_CFLAGS_KERNEL :=