From 033e30653835c5c3fc785ab60e6a110203e6241d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 12:05:38 +0200 Subject: resolve merge --- Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Config.in') diff --git a/Config.in b/Config.in index aa24b7f51..892fab4a4 100644 --- a/Config.in +++ b/Config.in @@ -104,8 +104,8 @@ choice prompt "Kernel Version" default ADK_KERNEL_VERSION_3_14_4 -config ADK_KERNEL_VERSION_3_15_RC5 - prompt "3.15-rc5" +config ADK_KERNEL_VERSION_3_15_RC6 + prompt "3.15-rc6" boolean config ADK_KERNEL_VERSION_3_14_4 @@ -143,7 +143,7 @@ endchoice config ADK_KERNEL_VERSION string - default "3.15-rc5" if ADK_KERNEL_VERSION_3_15_RC5 + default "3.15-rc6" if ADK_KERNEL_VERSION_3_15_RC6 default "3.14.4" if ADK_KERNEL_VERSION_3_14_4 default "3.13.11" if ADK_KERNEL_VERSION_3_13_11 default "3.12.20" if ADK_KERNEL_VERSION_3_12_20 -- cgit v1.2.3