diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:13:42 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:13:42 +0800 |
| commit | 1f6a2b80252dd323a766ebc2742bb9078476a5b8 (patch) | |
| tree | 9e5018a422781c54723740ff40426d9b61e94f6e /Makefile | |
| parent | b52e1c65e105805827038c232f5bba6f269c09e6 (diff) | |
| parent | e9cd0f1ce300f433a478bd1973dea112b5fbb800 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android
Conflicts:
keep -fno-pic flag in arch/arm64/Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 30 +SUBLEVEL = 31 EXTRAVERSION = NAME = Shuffling Zombie Juror |