diff options
author | Juergen Beisert <jbe@pengutronix.de> | 2013-01-13 16:27:00 +0100 |
---|---|---|
committer | Juergen Beisert <jbe@pengutronix.de> | 2013-03-03 13:35:13 +0100 |
commit | b5675ecc216e9de99f0ad827a24daed2f6a40241 (patch) | |
tree | 87277924c8c8a5ec95ea53914eee442992cf68c2 | |
parent | 6866a0e5522b1cb4f7910273cc8a5d55b290d9a1 (diff) | |
download | OSELAS.BSP-Pengutronix-Mini6410-b5675ecc216e9de99f0ad827a24daed2f6a40241.tar.gz OSELAS.BSP-Pengutronix-Mini6410-b5675ecc216e9de99f0ad827a24daed2f6a40241.tar.xz |
Kernel-3.7: Keep in sync with stable release 3.7.2
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r-- | configs/platform-friendlyarm-mini6410/Changelog | 2 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini6410/kernelconfig-3.7 | 2 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini6410/patches/linux-3.7/patch-3.7.1-2.bz2 | bin | 0 -> 41939 bytes | |||
-rw-r--r-- | configs/platform-friendlyarm-mini6410/patches/linux-3.7/series | 1 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini6410/patches/linux-3.7/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-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog index e9334cb..582536a 100644 --- a/configs/platform-friendlyarm-mini6410/Changelog +++ b/configs/platform-friendlyarm-mini6410/Changelog @@ -2,6 +2,8 @@ * Kernel 3.0: - keep in sync with stable release .58 + * Kernel 3.7: + - keep in sync with stable release .2 2012-09-15 Juergen Beisert <jbe@pengutronix.de> diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.7 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.7 index 9b845f0..20d6a1c 100644 --- a/configs/platform-friendlyarm-mini6410/kernelconfig-3.7 +++ b/configs/platform-friendlyarm-mini6410/kernelconfig-3.7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.7.1-ptx-master Kernel Configuration +# Linux/arm 3.7.2-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.7/patch-3.7.1-2.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.7/patch-3.7.1-2.bz2 Binary files differnew file mode 100644 index 0000000..1f3c78c --- /dev/null +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.7/patch-3.7.1-2.bz2 diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.7/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.7/series index f9e0eb4..6e70e76 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.7/series +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.7/series @@ -1,5 +1,6 @@ # keep in sync with stable releases patch-3.7.1.bz2 +patch-3.7.1-2.bz2 # some fixes, occured on LKML/ALKML PATCH_2_3_rtc-s3c_Disable_alarm_entries_that_are_not_chosen.diff diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.7/set-marker.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.7/set-marker.diff index f5375fb..d8d07a6 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.7/set-marker.diff +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.7/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.7/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 7 - SUBLEVEL = 1 + SUBLEVEL = 2 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Terrified Chipmunk diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index 7dec299..c979434 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -32,7 +32,7 @@ they are also available. Here is a list of currently available Linux kernel releases in the \ptxdistBSPName{}: \begin{itemize} - \item \curKernelRev{}, stable patch level 1 (defaultl) + \item \curKernelRev{}, stable patch level 2 (defaultl) \item 3.1, stable patch level 10 \item 3.0, stable patch level 58 \item 2.6.39, stable patch level 4 diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt index e7f4b0d..f2911a4 100644 --- a/protocol/acceptance-test.txt +++ b/protocol/acceptance-test.txt @@ -26,7 +26,7 @@ Preparations Base System ----------- -[ ] kernel-3.7.1 is a release +[ ] kernel-3.7.2 is a release [ ] kernel-3.1.10 is a release [ ] kernel-3.0.58 is a release [x] kernel-2.6.39.4 is a release |