diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2013-01-21 21:22:01 +0100 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2013-03-03 13:35:13 +0100 |
| commit | c98cb6edc09cb9e2e62e8530738b81dbc4657218 (patch) | |
| tree | 57631d84dcef06304629bd5480366e56af3ce691 | |
| parent | 6698ac3e7ef94ff5fc885c0f47e682ef6de964e0 (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini6410-c98cb6edc09cb9e2e62e8530738b81dbc4657218.tar.gz OSELAS.BSP-Pengutronix-Mini6410-c98cb6edc09cb9e2e62e8530738b81dbc4657218.tar.xz | |
Kernel-3.7: Keep in sync with stable release 3.7.3
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.7 | 2 | ||||
| -rw-r--r-- | configs/platform-friendlyarm-mini6410/patches/linux-3.7/patch-3.7.2-3.bz2 | bin | 0 -> 79197 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, 10 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog index 9b57968..e58cb3e 100644 --- a/configs/platform-friendlyarm-mini6410/Changelog +++ b/configs/platform-friendlyarm-mini6410/Changelog @@ -1,3 +1,8 @@ +2013-01-21 Juergen Beisert <jbe@pengutronix.de> + + * Kernel 3.7: + - keep in sync with stable release .3 + 2013-01-13 Juergen Beisert <jbe@pengutronix.de> * Kernel 3.0: diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.7 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.7 index 20d6a1c..3aa9a63 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.2-ptx-master Kernel Configuration +# Linux/arm 3.7.3-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.2-3.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.7/patch-3.7.2-3.bz2 Binary files differnew file mode 100644 index 0000000..9836231 --- /dev/null +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.7/patch-3.7.2-3.bz2 diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.7/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.7/series index 6e70e76..8163898 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.7/series +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.7/series @@ -1,6 +1,7 @@ # keep in sync with stable releases patch-3.7.1.bz2 patch-3.7.1-2.bz2 +patch-3.7.2-3.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 d8d07a6..2146292 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 = 2 + SUBLEVEL = 3 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Terrified Chipmunk diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index c979434..15879e4 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 2 (defaultl) + \item \curKernelRev{}, stable patch level 3 (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 f2911a4..84dada3 100644 --- a/protocol/acceptance-test.txt +++ b/protocol/acceptance-test.txt @@ -26,7 +26,7 @@ Preparations Base System ----------- -[ ] kernel-3.7.2 is a release +[ ] kernel-3.7.3 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 |