diff options
author | Juergen Borleis <jbe@pengutronix.de> | 2015-01-31 05:37:07 +0100 |
---|---|---|
committer | Juergen Borleis <jbe@pengutronix.de> | 2015-01-31 07:49:41 +0100 |
commit | e814557d5720118f854025d7b4ed1cc84fc5678c (patch) | |
tree | 28f31f647d5b4b5f2cc7d63687ae8f89fd1aff9f | |
parent | 01e2d1581c0484e298197c8898a32dd6bcfa7a69 (diff) | |
download | OSELAS.BSP-Pengutronix-Mini2440-e814557d5720118f854025d7b4ed1cc84fc5678c.tar.gz OSELAS.BSP-Pengutronix-Mini2440-e814557d5720118f854025d7b4ed1cc84fc5678c.tar.xz |
Kernel-3.12: keep in sync with stable release .37
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
-rw-r--r-- | configs/platform-friendlyarm-mini2440/Changelog | 2 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/kernelconfig-3.12 | 2 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.36-37.xz | bin | 0 -> 71428 bytes | |||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.12/series | 1 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff | 2 | ||||
-rw-r--r-- | documentation/plain_sources/special_notes.tex | 2 | ||||
-rw-r--r-- | protocol/acceptance-test.txt | 2 |
7 files changed, 7 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog index affc362..335c898 100644 --- a/configs/platform-friendlyarm-mini2440/Changelog +++ b/configs/platform-friendlyarm-mini2440/Changelog @@ -2,6 +2,8 @@ * Platform: - adapt the local udev rule to the curent PTXdist version + * Kernel 3.12: + - keep in sync with stable release .37 2015-01-26 Juergen Borleis <jbe@pengutronix.de diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 index 86e14a8..035542f 100644 --- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 +++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.12.36-ptx-master Kernel Configuration +# Linux/arm 3.12.37-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.36-37.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.36-37.xz Binary files differnew file mode 100644 index 0000000..007d0c8 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.36-37.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series index 7a26355..425e475 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series @@ -35,6 +35,7 @@ patch-3.12.32-33.xz patch-3.12.33-34.xz patch-3.12.34-35.xz patch-3.12.35-36.xz +patch-3.12.36-37.xz # add full board feature support fix_new_display_number.diff diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff index 63f559e..3476acc 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.12/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 12 - SUBLEVEL = 36 + SUBLEVEL = 37 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = One Giant Leap for Frogkind diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index 5c3e945..64151bc 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -37,7 +37,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}: \item 3.15 *), stable patch level 7 \item 3.14, stable patch level 29 \item 3.13 *), stable patch level 11 - \item 3.12, stable patch level 36 + \item 3.12, stable patch level 37 \item 3.11 *), stable patch level 10 **) \item 3.10, stable patch level 38 **) \item 3.9 *), stable patch level 11 diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt index 33a41cf..6e5e826 100644 --- a/protocol/acceptance-test.txt +++ b/protocol/acceptance-test.txt @@ -48,7 +48,7 @@ Base System [ ] kernel-3.15.7 is a release [ ] kernel-3.14.29 is a release [ ] kernel-3.13.11 is a release -[ ] kernel-3.12.36 is a release +[ ] kernel-3.12.37 is a release [ ] kernel-3.11.10 is a release [ ] kernel-3.10.38 is a release [x] kernel-3.9.11 is a release |