diff options
author | Juergen Borleis <jbe@pengutronix.de> | 2015-01-26 18:11:46 +0100 |
---|---|---|
committer | Juergen Borleis <jbe@pengutronix.de> | 2015-01-31 07:49:40 +0100 |
commit | 513b48e27151d344d273daaaf233d44081b957bb (patch) | |
tree | da271b7844d9297d788c54cdb92ea33014c01732 | |
parent | 9372011249e03855b7116595640eb32942565abc (diff) | |
download | OSELAS.BSP-Pengutronix-Mini2440-513b48e27151d344d273daaaf233d44081b957bb.tar.gz OSELAS.BSP-Pengutronix-Mini2440-513b48e27151d344d273daaaf233d44081b957bb.tar.xz |
Kernel-3.12: keep in sync with stable release .36
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
-rw-r--r-- | configs/platform-friendlyarm-mini2440/Changelog | 2 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/kernelconfig-3.12 | 2 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.31-32.xz | bin | 0 -> 61024 bytes | |||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.32-33.xz | bin | 0 -> 60144 bytes | |||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.33-34.xz | bin | 0 -> 39108 bytes | |||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.34-35.xz | bin | 0 -> 23840 bytes | |||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.35-36.xz | bin | 0 -> 25792 bytes | |||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.12/series | 5 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff | 2 | ||||
-rw-r--r-- | documentation/plain_sources/special_notes.tex | 2 | ||||
-rw-r--r-- | protocol/acceptance-test.txt | 2 |
11 files changed, 11 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog index 5fca4e4..4ec782a 100644 --- a/configs/platform-friendlyarm-mini2440/Changelog +++ b/configs/platform-friendlyarm-mini2440/Changelog @@ -13,6 +13,8 @@ - keep in sync with stable release .66 * Kernel-3.4: - keep in sync with stable release .105 + * Kernel 3.12: + - keep in sync with stable release .36 2015-01-21 Juergen Borleis <jbe@pengutronix.de diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 index 96c35b6..86e14a8 100644 --- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 +++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.12.31-ptx-master Kernel Configuration +# Linux/arm 3.12.36-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.31-32.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.31-32.xz Binary files differnew file mode 100644 index 0000000..8b87d72 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.31-32.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.32-33.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.32-33.xz Binary files differnew file mode 100644 index 0000000..0c71847 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.32-33.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.33-34.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.33-34.xz Binary files differnew file mode 100644 index 0000000..3122165 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.33-34.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.34-35.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.34-35.xz Binary files differnew file mode 100644 index 0000000..334bc9f --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.34-35.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.35-36.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.35-36.xz Binary files differnew file mode 100644 index 0000000..2b49a9f --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.35-36.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series index 3cce37f..7a26355 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series @@ -30,6 +30,11 @@ patch-3.12.27-28.xz patch-3.12.28-29.xz patch-3.12.29-30.xz patch-3.12.30-31.xz +patch-3.12.31-32.xz +patch-3.12.32-33.xz +patch-3.12.33-34.xz +patch-3.12.34-35.xz +patch-3.12.35-36.xz # add full board feature support fix_new_display_number.diff diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff index 3cf4ac1..63f559e 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.12/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 12 - SUBLEVEL = 31 + SUBLEVEL = 36 -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 880c006..3bc8335 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -37,7 +37,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}: \item 3.15 *), stable patch level 7 \item 3.14, stable patch level 23 \item 3.13 *), stable patch level 11 - \item 3.12, stable patch level 31 + \item 3.12, stable patch level 36 \item 3.11 *), stable patch level 10 **) \item 3.10, stable patch level 38 **) \item 3.9 *), stable patch level 11 diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt index 2b1436f..12c58f9 100644 --- a/protocol/acceptance-test.txt +++ b/protocol/acceptance-test.txt @@ -48,7 +48,7 @@ Base System [ ] kernel-3.15.7 is a release [ ] kernel-3.14.23 is a release [ ] kernel-3.13.11 is a release -[ ] kernel-3.12.31 is a release +[ ] kernel-3.12.36 is a release [ ] kernel-3.11.10 is a release [ ] kernel-3.10.38 is a release [x] kernel-3.9.11 is a release |