diff options
author | Juergen Beisert <jbe@pengutronix.de> | 2011-12-11 17:34:54 +0100 |
---|---|---|
committer | Juergen Beisert <jbe@pengutronix.de> | 2012-07-17 16:52:51 +0200 |
commit | cc13bd9a6ef50c8fc9c0551148fc3f3e985fbc06 (patch) | |
tree | 526248d74b1538b66766a7980115321967d8f8a0 | |
parent | 6e1306027c6ba790c08163800745a7b8478c939b (diff) | |
download | OSELAS.BSP-Pengutronix-Mini6410-cc13bd9a6ef50c8fc9c0551148fc3f3e985fbc06.tar.gz OSELAS.BSP-Pengutronix-Mini6410-cc13bd9a6ef50c8fc9c0551148fc3f3e985fbc06.tar.xz |
Kernel-3.1: keep in sync with stable release 3.1.5
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.1 | 2 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.4-5.bz2 | bin | 0 -> 39398 bytes | |||
-rw-r--r-- | configs/platform-friendlyarm-mini6410/patches/linux-3.1/series | 1 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff | 2 | ||||
-rw-r--r-- | documentation/plain_sources/special_notes.tex | 2 |
6 files changed, 6 insertions, 3 deletions
diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog index c4225aa..742d243 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 .13 + * Kernel 3.1: + - keep in sync with stable release .5 2011-12-04 Juergen Beisert <jbe@pengutronix.de> diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.1 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.1 index 0ec51e5..d064ba9 100644 --- a/configs/platform-friendlyarm-mini6410/kernelconfig-3.1 +++ b/configs/platform-friendlyarm-mini6410/kernelconfig-3.1 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.1.4-ptx-master Kernel Configuration +# Linux/arm 3.1.5-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.4-5.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.4-5.bz2 Binary files differnew file mode 100644 index 0000000..e4395b5 --- /dev/null +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.4-5.bz2 diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series index 35d5c24..939349c 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series @@ -3,6 +3,7 @@ patch-3.1.1.bz2 patch-3.1.1-2.bz2 patch-3.1.2-3.bz2 patch-3.1.3-4.bz2 +patch-3.1.4-5.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.1/set-marker.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff index 375c815..3746a51 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.1/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 1 - SUBLEVEL = 4 + SUBLEVEL = 5 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = "Divemaster Edition" diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index ca57f20..2c1a932 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 4 (defaultl) + \item \curKernelRev{}, stable patch level 5 (defaultl) \item 3.0, stable patch level 13 \item 2.6.39, stable patch level 4 \end{itemize} |