diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2013-04-01 22:57:43 +0200 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2013-06-12 12:14:05 +0200 |
| commit | 549d84803460a3762bdf2369c0168010874b8097 (patch) | |
| tree | 366083194c979699646dcd2d41e3751f4255c18b | |
| parent | 069540c58b50a85a985d8b3d65e050ed9c553642 (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini2440-549d84803460a3762bdf2369c0168010874b8097.tar.gz OSELAS.BSP-Pengutronix-Mini2440-549d84803460a3762bdf2369c0168010874b8097.tar.xz | |
Kernel-3.2: keep in sync with stable release 3.2.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.2 | 2 | ||||
| -rw-r--r-- | patches/linux-3.2/patch-3.2.41-42.bz2 | bin | 0 -> 31235 bytes | |||
| -rw-r--r-- | patches/linux-3.2/series | 1 | ||||
| -rw-r--r-- | patches/linux-3.2/set-marker.diff | 2 |
6 files changed, 6 insertions, 3 deletions
@@ -2,6 +2,8 @@ * Kernel 3.0: - keep in sync with stable release .71 + * Kernel 3.2: + - keep in sync with stable release .42 2013-03-20 Juergen Beisert <jbe@pengutronix.de diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index 824a8d7..c20c4d5 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -38,7 +38,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}: \item 3.5 *), stable patch level 7 \item 3.4, stable patch level 37 \item 3.3 *), stable patch level 8 - \item 3.2, stable patch level 41 + \item 3.2, stable patch level 42 \item 3.1 *), stable patch level 10 \item 3.0, stable patch level 71 \item 2.6.39 *), stable patch level 4 diff --git a/kernelconfig-3.2 b/kernelconfig-3.2 index d0ca1b7..17ce9ed 100644 --- a/kernelconfig-3.2 +++ b/kernelconfig-3.2 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.2.41-ptx-master Kernel Configuration +# Linux/arm 3.2.42-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y diff --git a/patches/linux-3.2/patch-3.2.41-42.bz2 b/patches/linux-3.2/patch-3.2.41-42.bz2 Binary files differnew file mode 100644 index 0000000..a2a2fb4 --- /dev/null +++ b/patches/linux-3.2/patch-3.2.41-42.bz2 diff --git a/patches/linux-3.2/series b/patches/linux-3.2/series index b23c9c3..b09139a 100644 --- a/patches/linux-3.2/series +++ b/patches/linux-3.2/series @@ -40,6 +40,7 @@ patch-3.2.37-38.bz2 patch-3.2.38-39.bz2 patch-3.2.39-40.bz2 patch-3.2.40-41.bz2 +patch-3.2.41-42.bz2 PATCH_1_4_s3c2440_mini2440_Add_support_for_new_LCD_panels.diff add_lcd_w35i.diff diff --git a/patches/linux-3.2/set-marker.diff b/patches/linux-3.2/set-marker.diff index eec0b64..3c0b29f 100644 --- a/patches/linux-3.2/set-marker.diff +++ b/patches/linux-3.2/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.2/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 2 - SUBLEVEL = 41 + SUBLEVEL = 42 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Saber-toothed Squirrel |