diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2014-02-06 22:49:34 +0100 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2014-02-06 22:49:34 +0100 |
| commit | e06554a76cbbed943c80a5953109f41e0e8af2a0 (patch) | |
| tree | a70b231d9dddd3c3b225fc2e6cfbe7630a21cd1e | |
| parent | 982e28aaa743cf36c11f351bff31ab0550973900 (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini2440-e06554a76cbbed943c80a5953109f41e0e8af2a0.tar.gz OSELAS.BSP-Pengutronix-Mini2440-e06554a76cbbed943c80a5953109f41e0e8af2a0.tar.xz | |
Kernel-3.10: keep in sync with stable release .29
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.10 | 2 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.10/patch-3.10.28-29.xz | bin | 0 -> 37420 bytes | |||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.10/series | 1 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.10/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 f473576..f6c9a52 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 .79 + * Kernel-3.10: + - keep in sync with stable release .29 2014-01-30 Juergen Beisert <jbe@pengutronix.de diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.10 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.10 index 18699f2..d858354 100644 --- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.10 +++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.10 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.10.28-ptx-master Kernel Configuration +# Linux/arm 3.10.29-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.10/patch-3.10.28-29.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.10/patch-3.10.28-29.xz Binary files differnew file mode 100644 index 0000000..d99596b --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.10/patch-3.10.28-29.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.10/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.10/series index e9e9160..62212d9 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.10/series +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.10/series @@ -26,6 +26,7 @@ patch-3.10.24-25.xz patch-3.10.25-26.xz patch-3.10.26-27.xz patch-3.10.27-28.xz +patch-3.10.28-29.xz # keep the kernel's name fix_kernel_name.diff diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.10/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.10/set-marker.diff index 6c08139..d242524 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.10/set-marker.diff +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.10/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.10/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 10 - SUBLEVEL = 28 + SUBLEVEL = 29 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Unicycling Gorilla diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index cd687a3..ff237fa 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -35,7 +35,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}: \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 + \item 3.10, stable patch level 29 \item 3.9 *), stable patch level 11 \item 3.8 *), stable patch level 13 \item 3.7 *), stable patch level 10 diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt index 845d5cb..2130991 100644 --- a/protocol/acceptance-test.txt +++ b/protocol/acceptance-test.txt @@ -47,7 +47,7 @@ Base System [ ] 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 +[ ] kernel-3.10.29 is a release [x] kernel-3.9.11 is a release [x] kernel-3.8.13 is a release [x] kernel-3.7.10 is a release |