diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-16 13:18:55 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-16 13:18:55 +0100 |
| commit | 844bdd6097f60d393ecd060c4e376bc15dcd194e (patch) | |
| tree | 9c7ff1343208574e021a6bcf08730f99db87fc47 /Makefile | |
| parent | 4c52bc8a2ff3c0373d371995eaef34df98e1fa4c (diff) | |
| parent | b1ce5b792e0c6bddb9012dbbff63cfcc3a4aaf87 (diff) | |
| download | kernel_samsung_smdk4412-844bdd6097f60d393ecd060c4e376bc15dcd194e.zip kernel_samsung_smdk4412-844bdd6097f60d393ecd060c4e376bc15dcd194e.tar.gz kernel_samsung_smdk4412-844bdd6097f60d393ecd060c4e376bc15dcd194e.tar.bz2 | |
Merge remote-tracking branch 'cyanogen/cm-13.0' into replicant-6.0-new
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
Makefile
firmware/Makefile
firmware/epen/W9001_B713.bin.ihex
firmware/epen/W9001_B746.bin.ihex
firmware/epen/W9001_B746JD.bin.ihex
firmware/epen/W9001_B746L.bin.ihex
firmware/epen/W9001_B746S.bin.ihex
Diffstat (limited to 'Makefile')
| -rw-r--r--[-rwxr-xr-x] | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,8 +1,8 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 64 +SUBLEVEL = 101 EXTRAVERSION = -NAME = Sneaky Weasel +NAME = Sodden Ben Lomond RELEASE = replicant # *DOCUMENTATION* |