diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-30 10:51:05 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-30 10:51:05 +0800 |
| commit | 7b324954a4d9bbef9d6acd7c329f6e1289c1d7cb (patch) | |
| tree | d07bccdf7db563dce2159b2579cbdddf46a6a92b /Makefile | |
| parent | 319076fb46276e430ca0a8c5ab18bf02fa5dca9c (diff) | |
| parent | 59e65b4bbfe7d0139ab1ab59cd27a5db95f5bb7b (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rt
Conflicts:
drivers/gpu/drm/i915/i915_gem_shrinker.c
add cpu_chill in fs/dcache.c
select USERCOPY in SLAB init/Kconfig
remove VM_DEBUG in irq disable mm/memcontrol.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 15 +SUBLEVEL = 18 EXTRAVERSION = NAME = Blurry Fish Butt |