summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2018-05-30 22:42:57 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2018-05-30 22:42:57 +0200
commitc9d74f2522c4876c048d4a111de24a943ea16095 (patch)
treed52dbee6a7bc545d13388caf837f7fa439ed3c8f
parentcb3afe1f1187bba5801dafadd9974bfbe3b9ff7a (diff)
parent50eb02ed89920f753202d703541bebbd9d8c3dd8 (diff)
Merge 4.4.135 into android-4.4
Changes in 4.4.135 Revert "vti4: Don't override MTU passed on link creation via IFLA_MTU" Linux 4.4.135 Change-Id: I374da4066ae416e2292d483b36615bcd65a23187 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 562537351e78..da9d8d027629 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
-SUBLEVEL = 134
+SUBLEVEL = 135
EXTRAVERSION =
NAME = Blurry Fish Butt