diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2013-01-13 16:18:43 +0100 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2013-03-03 13:35:13 +0100 |
| commit | 6866a0e5522b1cb4f7910273cc8a5d55b290d9a1 (patch) | |
| tree | ee5e474f0eafa016a1de34639eff4742d760e58b | |
| parent | 09ccd07c2cd4368bba8e8c1f0d784aadabf48ac8 (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini6410-6866a0e5522b1cb4f7910273cc8a5d55b290d9a1.tar.gz OSELAS.BSP-Pengutronix-Mini6410-6866a0e5522b1cb4f7910273cc8a5d55b290d9a1.tar.xz | |
Kernel-3.0: Keep in sync with stable release 3.0.58
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
| -rw-r--r-- | configs/platform-friendlyarm-mini6410/Changelog | 5 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini6410/kernelconfig-3.0 | 2 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.57-58.bz2 | bin | 0 -> 16639 bytes | |||
| -rw-r--r-- | configs/platform-friendlyarm-mini6410/patches/linux-3.0/series | 1 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini6410/patches/linux-3.0/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, 10 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog index 79ee6ca..e9334cb 100644 --- a/configs/platform-friendlyarm-mini6410/Changelog +++ b/configs/platform-friendlyarm-mini6410/Changelog @@ -1,3 +1,8 @@ +2013-01-13 Juergen Beisert <jbe@pengutronix.de> + + * Kernel 3.0: + - keep in sync with stable release .58 + 2012-09-15 Juergen Beisert <jbe@pengutronix.de> * Platform: diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.0 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.0 index 2760b49..a1ae3cf 100644 --- a/configs/platform-friendlyarm-mini6410/kernelconfig-3.0 +++ b/configs/platform-friendlyarm-mini6410/kernelconfig-3.0 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 3.0.57-ptx-master Kernel Configuration +# Linux/arm 3.0.58-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.57-58.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.57-58.bz2 Binary files differnew file mode 100644 index 0000000..cb5c362 --- /dev/null +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.57-58.bz2 diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series index a78c73b..129e0df 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series @@ -56,6 +56,7 @@ patch-3.0.53-54.bz2 patch-3.0.54-55.bz2 patch-3.0.55-56.bz2 patch-3.0.56-57.bz2 +patch-3.0.57-58.bz2 # some fixes, occured on LKML/ALKML PATCH_1_3_rtc-s3c_Correct_debug_messages.diff diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff index e8175aa..17bb896 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.0/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 0 - SUBLEVEL = 57 + SUBLEVEL = 58 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Sneaky Weasel diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index a6bd918..7dec299 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -34,7 +34,7 @@ releases in the \ptxdistBSPName{}: \begin{itemize} \item \curKernelRev{}, stable patch level 1 (defaultl) \item 3.1, stable patch level 10 - \item 3.0, stable patch level 57 + \item 3.0, stable patch level 58 \item 2.6.39, stable patch level 4 \end{itemize} diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt index 89763af..e7f4b0d 100644 --- a/protocol/acceptance-test.txt +++ b/protocol/acceptance-test.txt @@ -28,7 +28,7 @@ Base System [ ] kernel-3.7.1 is a release [ ] kernel-3.1.10 is a release -[ ] kernel-3.0.57 is a release +[ ] kernel-3.0.58 is a release [x] kernel-2.6.39.4 is a release [x] u-boot-1.1.6 is a release |