diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 12:05:38 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 12:05:38 +0200 |
| commit | 033e30653835c5c3fc785ab60e6a110203e6241d (patch) | |
| tree | fbb575df1204e3d44fd1262af721bae206fc848e /mk/kernel-ver.mk | |
| parent | 8f3142f161895b5fb02c12d1a4a6e5eec8e861d6 (diff) | |
resolve merge
Diffstat (limited to 'mk/kernel-ver.mk')
| -rw-r--r-- | mk/kernel-ver.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index d05998491..6a01710cd 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= c7c565d14833550faa39ef8279272182 endif -ifeq ($(ADK_KERNEL_VERSION_3_15_RC5),y) -KERNEL_VERSION:= 3.15-rc5 -KERNEL_MOD_VERSION:= 3.15.0-rc5 +ifeq ($(ADK_KERNEL_VERSION_3_15_RC6),y) +KERNEL_VERSION:= 3.15-rc6 +KERNEL_MOD_VERSION:= 3.15.0-rc6 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= b030ddc3f1581c4675c31e51f3551089 +KERNEL_MD5SUM:= 2f6ee0845fa66391696db2be6cd69cf9 endif ifeq ($(ADK_KERNEL_VERSION_3_14_4),y) KERNEL_VERSION:= 3.14.4 |