diff options
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/Changelog | 2 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/kernelconfig-3.13 | 2 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.13/patch-3.13.5-6.xz | bin | 0 -> 61888 bytes | |||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.13/series | 1 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.13/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 0c38536..d676212 100644 --- a/configs/platform-friendlyarm-mini2440/Changelog +++ b/configs/platform-friendlyarm-mini2440/Changelog @@ -2,6 +2,8 @@ * Kernel-3.10: - keep in sync with stable release .33 + * Kernel 3.13: + - keep in sync with stable release .6 2014-02-22 Juergen Beisert <jbe@pengutronix.de diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.13 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.13 index 4b3f406..c75bc7d 100644 --- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.13 +++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.13 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.13.5-ptx-master Kernel Configuration +# Linux/arm 3.13.6-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.13/patch-3.13.5-6.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/patch-3.13.5-6.xz Binary files differnew file mode 100644 index 0000000..03b2ed6 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/patch-3.13.5-6.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series index 159a553..67fba21 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series @@ -4,6 +4,7 @@ patch-3.13.1-2.xz patch-3.13.2-3.xz patch-3.13.3-4.xz patch-3.13.4-5.xz +patch-3.13.5-6.xz # add full board feature support fix_new_display_number.diff diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.13/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/set-marker.diff index b4d9308..1236b59 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.13/set-marker.diff +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.13/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 13 - SUBLEVEL = 5 + SUBLEVEL = 6 -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 f594256..aa084c9 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -32,7 +32,7 @@ they are still available and also some of them are still maintained. Here is a list of currently available Linux kernel releases in the \ptxdistBSPName{}: \begin{itemize} - \item \curKernelRev{}, stable patch level 5 (default) + \item \curKernelRev{}, stable patch level 6 (default) \item 3.12, stable patch level 13 \item 3.11 *), stable patch level 10 \item 3.10, stable patch level 33 diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt index 51eca8b..b47e930 100644 --- a/protocol/acceptance-test.txt +++ b/protocol/acceptance-test.txt @@ -44,7 +44,7 @@ Base System [x] qml demo is a release [x] rule file uses the release [x] bootloader is a release -[ ] kernel-3.13.5 is a release +[ ] kernel-3.13.6 is a release [ ] kernel-3.12.13 is a release [ ] kernel-3.11.10 is a release [ ] kernel-3.10.33 is a release |