diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-06 22:58:13 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-01-06 23:14:35 +0300 |
| commit | 9d9938854efcf2f21381b930bc1324e95640e0c4 (patch) | |
| tree | 7b136c25af5fcc64258f3427f985c1dc667ae0bd /Makefile | |
| parent | ca9ea7a5ffda53ce9e9f3e14b9b104d85db47c7d (diff) | |
| parent | 3f37b26f8d57756b591383a9d8ce1cd628bc773c (diff) | |
| download | linux-9d9938854efcf2f21381b930bc1324e95640e0c4.tar.xz | |
Merge branch 'for-linus' into for-next
Conflicts:
drivers/gpu/drm/i915/intel_display.c
sound/soc/intel/skylake/skl.h
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 4 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -rc6 +EXTRAVERSION = -rc8 NAME = Blurry Fish Butt # *DOCUMENTATION* |