diff options
| author | Juergen Borleis <jbe@pengutronix.de> | 2015-01-26 18:33:05 +0100 |
|---|---|---|
| committer | Juergen Borleis <jbe@pengutronix.de> | 2015-01-31 07:49:39 +0100 |
| commit | 9372011249e03855b7116595640eb32942565abc (patch) | |
| tree | 2850981d75482c90005fdfbc0419a626586a218a | |
| parent | 2a9d622ba34721fb8663c8d6974d98bb7d9ca2e3 (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini2440-9372011249e03855b7116595640eb32942565abc.tar.gz OSELAS.BSP-Pengutronix-Mini2440-9372011249e03855b7116595640eb32942565abc.tar.xz | |
Kernel-3.4: keep in sync with stable release .105
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/Changelog | 3 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/kernelconfig-3.4 | 2 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.104-105.xz | bin | 0 -> 28960 bytes | |||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.4/series | 1 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.4/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, 8 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog index 5ca8d70..5fca4e4 100644 --- a/configs/platform-friendlyarm-mini2440/Changelog +++ b/configs/platform-friendlyarm-mini2440/Changelog @@ -10,6 +10,9 @@ - update to OSELAS.Toolchain()-2014.12 - use the new autoversion feature of PTXdist * Kernel-3.2: + - keep in sync with stable release .66 + * Kernel-3.4: + - keep in sync with stable release .105 2015-01-21 Juergen Borleis <jbe@pengutronix.de diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.4 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.4 index b1915bd..a13d213 100644 --- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.4 +++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.4 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.104-ptx-master Kernel Configuration +# Linux/arm 3.4.105-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.104-105.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.104-105.xz Binary files differnew file mode 100644 index 0000000..34e96c5 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.104-105.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series index 6d04d0d..3377f06 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series @@ -103,6 +103,7 @@ patch-3.4.100-101.xz patch-3.4.101-102.xz patch-3.4.102-103.xz patch-3.4.103-104.xz +patch-3.4.104-105.xz fix_new_display_number.diff PATCH_1_4_s3c2440_mini2440_Add_support_for_new_LCD_panels.diff diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff index 2ea3eb4..3418716 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.4/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 4 - SUBLEVEL = 104 + SUBLEVEL = 105 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Saber-toothed Squirrel diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index e3fb8a3..880c006 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -45,7 +45,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}: \item 3.7 *), stable patch level 10 \item 3.6 *), stable patch level 11 \item 3.5 *), stable patch level 7 - \item 3.4, stable patch level 104 + \item 3.4, stable patch level 105 \item 3.3 *), stable patch level 8 \item 3.2, stable patch level 66 \item 3.1 *), stable patch level 10 diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt index 79e041d..2b1436f 100644 --- a/protocol/acceptance-test.txt +++ b/protocol/acceptance-test.txt @@ -56,7 +56,7 @@ Base System [x] kernel-3.7.10 is a release [x] kernel-3.6.11 is a release [x] kernel-3.5.7 is a release -[ ] kernel-3.4.104 is a release +[ ] kernel-3.4.105 is a release [x] kernel-3.3.8 is a release [ ] kernel-3.2.66 is a release [x] kernel-3.1.10 is a release |