aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-18 10:22:56 +0100
committerMicael Karlberg <[email protected]>2011-03-18 10:22:56 +0100
commit588a0d9c86b1b85a2cd7635460564ddaac566882 (patch)
tree6f86ef92bdea8a01310cb89703beb1e69c9280bd /lib/kernel
parent91b2e57ea0e3ab794d4b57a12ef10205383525a5 (diff)
parentf10de199e5aad1aecbff03a5e7af9e1c5d017301 (diff)
downloadotp-588a0d9c86b1b85a2cd7635460564ddaac566882.tar.gz
otp-588a0d9c86b1b85a2cd7635460564ddaac566882.tar.bz2
otp-588a0d9c86b1b85a2cd7635460564ddaac566882.zip
Merge branch 'bmk/inets/httpc/support_upload_body_streaming/OTP-9094' into bmk/inets/inet56_integration
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 e33b90a274..e7b71cc168 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 2.14.3
+KERNEL_VSN = 2.14.4