diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2014-01-30 17:50:15 +0100 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2014-01-30 17:50:15 +0100 |
| commit | 697aa7d44a00eb09e2d0600db2f52d87cdc26c6e (patch) | |
| tree | 738680f3065a03cea8543b76a5bfb5592420a0c7 | |
| parent | ca85b3465b3d375a3037bf9ab081ad23e339a45c (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini2440-697aa7d44a00eb09e2d0600db2f52d87cdc26c6e.tar.gz OSELAS.BSP-Pengutronix-Mini2440-697aa7d44a00eb09e2d0600db2f52d87cdc26c6e.tar.xz | |
Kernel-3.13: keep in sync with stable release .1
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.1.xz | bin | 0 -> 2884 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 835f0cf..e3d33fa 100644 --- a/configs/platform-friendlyarm-mini2440/Changelog +++ b/configs/platform-friendlyarm-mini2440/Changelog @@ -2,6 +2,8 @@ * Kernel-3.4: - keep in sync with stable release .78 + * Kernel 3.13: + - keep in sync with stable release .1 2014-01-27 Juergen Beisert <jbe@pengutronix.de diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.13 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.13 index 88c0909..4a82246 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.0-ptx-master Kernel Configuration +# Linux/arm 3.13.1-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.1.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/patch-3.13.1.xz Binary files differnew file mode 100644 index 0000000..26799e5 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/patch-3.13.1.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series index 3306808..142aa1b 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.13/series @@ -1,4 +1,5 @@ # keep in sync with stable +patch-3.13.1.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 4fe8aa5..65863e5 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 = 0 + SUBLEVEL = 1 -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 2dfc03b..e9e7887 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{} (default) + \item \curKernelRev{}, stable patch level 1 (default) \item 3.12, stable patch level 9 \item 3.11 *), stable patch level 10 \item 3.10, stable patch level 28 diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt index b766ef6..4a14418 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.0 is a release +[ ] kernel-3.13.1 is a release [ ] kernel-3.12.9 is a release [ ] kernel-3.11.10 is a release [ ] kernel-3.10.28 is a release |