aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-08-10 10:31:26 -0700
committerKevin Hilman <khilman@linaro.org>2015-08-10 10:31:26 -0700
commitfffb1d2b9e7ded3277113d61aefa57a6430bc4ac (patch)
treead3db15ed2c0c199cc559a0fbca6d6dfd1d68c3b /Makefile
parent7c29714d4bf7bc3fb3b5460eb020f7ebf3e2918a (diff)
parentcec285f5fdb58cc760d0b882f9a2d94d7ff21a8a (diff)
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5c3bb1849120..56992aa87250 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 3
PATCHLEVEL = 18
-SUBLEVEL = 19
+SUBLEVEL = 20
EXTRAVERSION =
NAME = Shuffling Zombie Juror