diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2013-04-29 17:01:32 +0200 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2013-06-12 12:14:07 +0200 |
| commit | a4b6665346b2cec1cd3d3c6ec67493c006ac0b16 (patch) | |
| tree | 1fb037aa5393751e59d6a1ade7e9bb323e788f07 | |
| parent | 3a71325a1cc0efe94c452e1b32623e4b94401e3e (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini2440-a4b6665346b2cec1cd3d3c6ec67493c006ac0b16.tar.gz OSELAS.BSP-Pengutronix-Mini2440-a4b6665346b2cec1cd3d3c6ec67493c006ac0b16.tar.xz | |
Kernel-3.4: keep in sync with stable release 3.4.42
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | documentation/plain_sources/special_notes.tex | 2 | ||||
| -rw-r--r-- | kernelconfig-3.4 | 2 | ||||
| -rw-r--r-- | patches/linux-3.4/patch-3.4.41-42.bz2 | bin | 0 -> 11018 bytes | |||
| -rw-r--r-- | patches/linux-3.4/series | 1 | ||||
| -rw-r--r-- | patches/linux-3.4/set-marker.diff | 2 |
6 files changed, 6 insertions, 3 deletions
@@ -4,6 +4,8 @@ - keep in sync with stable release .75 * Kernel 3.2: - keep in sync with stable release .43 + * Kernel 3.4: + - keep in sync with stable release .42 2013-04-17 Juergen Beisert <jbe@pengutronix.de diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index 8542f7c..31f1a49 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -36,7 +36,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}: \item 3.7 *), stable patch level 10 \item 3.6 *), stable patch level 11 \item 3.5 *), stable patch level 7 - \item 3.4, stable patch level 41 + \item 3.4, stable patch level 42 \item 3.3 *), stable patch level 8 \item 3.2, stable patch level 44 \item 3.1 *), stable patch level 10 diff --git a/kernelconfig-3.4 b/kernelconfig-3.4 index ba532f8..411f11b 100644 --- a/kernelconfig-3.4 +++ b/kernelconfig-3.4 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.41-ptx-master Kernel Configuration +# Linux/arm 3.4.42-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y diff --git a/patches/linux-3.4/patch-3.4.41-42.bz2 b/patches/linux-3.4/patch-3.4.41-42.bz2 Binary files differnew file mode 100644 index 0000000..900e9c4 --- /dev/null +++ b/patches/linux-3.4/patch-3.4.41-42.bz2 diff --git a/patches/linux-3.4/series b/patches/linux-3.4/series index 37d4dcf..4d42b49 100644 --- a/patches/linux-3.4/series +++ b/patches/linux-3.4/series @@ -40,6 +40,7 @@ patch-3.4.37-38.bz2 patch-3.4.38-39.bz2 patch-3.4.39-40.bz2 patch-3.4.40-41.bz2 +patch-3.4.41-42.bz2 fix_new_display_number.diff PATCH_1_4_s3c2440_mini2440_Add_support_for_new_LCD_panels.diff diff --git a/patches/linux-3.4/set-marker.diff b/patches/linux-3.4/set-marker.diff index bd41431..aa544a1 100644 --- a/patches/linux-3.4/set-marker.diff +++ b/patches/linux-3.4/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.4/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 4 - SUBLEVEL = 41 + SUBLEVEL = 42 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Saber-toothed Squirrel |