aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-04-13 11:46:59 +0200
committerSiri Hansen <[email protected]>2016-04-13 11:46:59 +0200
commitc7fdee3325a19cce992093940a45ef07b422ecb9 (patch)
tree03aefc602fcefcea3eac2e2c112b566ea1eda46c /lib/kernel
parent88c00152dce3b3ba50f621f9145f459ec9cbbdf7 (diff)
parentbfaefd9558d0ebfb38878ebf26aa7693c38bc11f (diff)
downloadotp-c7fdee3325a19cce992093940a45ef07b422ecb9.tar.gz
otp-c7fdee3325a19cce992093940a45ef07b422ecb9.tar.bz2
otp-c7fdee3325a19cce992093940a45ef07b422ecb9.zip
Merge branch 'siri/otp-19-vsns'
* siri/otp-19-vsns: Update version of common_test for OTP-19 Update versions
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index c8917ebc3c..e7d422d03c 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 4.2
+KERNEL_VSN = 5.0