aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <[email protected]>2015-05-08 14:38:55 +0200
committerGreg Kroah-Hartman <[email protected]>2015-05-08 14:38:55 +0200
commitb4da00601edd39184fa187d5fd6dfc36232991cc (patch)
treef58bafde4efd814bb78b4f531b1eab48dcf8e561 /Makefile
parentd5a7d45fb5b667fd10a225ccf11fe395fb2417d9 (diff)
parent5ebe6afaf0057ac3eaeb98defd5456894b446d22 (diff)
Merge 4.1-rc2 into staging-next
We want the fixes in here to make merges and testing easier. Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7ff1239f9cd2..2da553fd7fc3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 1
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
NAME = Hurr durr I'ma sheep
# *DOCUMENTATION*