diff options
author | Juergen Beisert <jbe@pengutronix.de> | 2014-02-22 23:52:37 +0100 |
---|---|---|
committer | Juergen Beisert <jbe@pengutronix.de> | 2014-02-22 23:52:37 +0100 |
commit | 167826a1fd410691de496b17c6aaa21b202c5abc (patch) | |
tree | f8692a30ed8a3247067137f7ce419c781a371899 | |
parent | c5c5a168048b48669569920e3d6fce81e6211746 (diff) | |
download | OSELAS.BSP-Pengutronix-Mini2440-167826a1fd410691de496b17c6aaa21b202c5abc.tar.gz OSELAS.BSP-Pengutronix-Mini2440-167826a1fd410691de496b17c6aaa21b202c5abc.tar.xz |
Kernel-3.13: keep in sync with stable release .5
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-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.4-5.xz | bin | 0 -> 29416 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 b4fa454..b2f48ec 100644 --- a/configs/platform-friendlyarm-mini2440/Changelog +++ b/configs/platform-friendlyarm-mini2440/Changelog @@ -6,6 +6,8 @@ - keep in sync with stable release .32 * Kernel 3.12: - keep in sync with stable release .13 + * Kernel 3.13: + - keep in sync with stable release .5 2014-02-20 Juergen Beisert <jbe@pengutronix.de diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.13 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.13 index 51ef1ed..4b3f406 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.4-ptx-master Kernel Configuration +# Linux/arm 3.13.5-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.4-5.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/patch-3.13.4-5.xz Binary files differnew file mode 100644 index 0000000..e84d4d9 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/patch-3.13.4-5.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series index 9445df2..159a553 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series @@ -3,6 +3,7 @@ patch-3.13.1.xz patch-3.13.1-2.xz patch-3.13.2-3.xz patch-3.13.3-4.xz +patch-3.13.4-5.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 47ed7f7..b4d9308 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 = 4 + SUBLEVEL = 5 -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 ba61b0e..8949b3c 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 4 (default) + \item \curKernelRev{}, stable patch level 5 (default) \item 3.12, stable patch level 13 \item 3.11 *), stable patch level 10 \item 3.10, stable patch level 32 diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt index 981d356..a165849 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.4 is a release +[ ] kernel-3.13.5 is a release [ ] kernel-3.12.13 is a release [ ] kernel-3.11.10 is a release [ ] kernel-3.10.32 is a release |