diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 11:54:25 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 11:54:25 -0700 |
commit | 0e496b8e84410c96d1ffc86f0b37b0328a4234da (patch) | |
tree | d8a2aeeaee03eb4f305ba4dc5ab9395c4ee31321 /Makefile | |
parent | 214da6728acac285cac0e8e9b6c4c13838b8e1b0 (diff) | |
parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
download | blackbird-op-linux-0e496b8e84410c96d1ffc86f0b37b0328a4234da.tar.gz blackbird-op-linux-0e496b8e84410c96d1ffc86f0b37b0328a4234da.zip |
Merge 3.10-rc6 into char-misc-next
We want the fixes in here.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 10 SUBLEVEL = 0 -EXTRAVERSION = -rc5 +EXTRAVERSION = -rc6 NAME = Unicycling Gorilla # *DOCUMENTATION* |