diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 22:36:04 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 22:36:04 (GMT) |
| commit | 249f3c4fe4fdef159d3f9b3f7a6c41a92103c860 (patch) | |
| tree | 58abfec8444741fd3bd403a908be50c4f63d4842 /Makefile | |
| parent | 54573c4a073ff510d028f423ed3074573c7d9437 (diff) | |
| parent | 18558cae0272f8fd9647e69d3fec1565a7949865 (diff) | |
| download | linux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.tar.xz | |
Merge 4.5-rc4 into tty-next
We want the fixes in here, and this resolves a merge error in tty_io.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 4 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc4 NAME = Blurry Fish Butt # *DOCUMENTATION* |