diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2013-03-17 13:35:23 +0100 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2013-03-17 13:35:23 +0100 |
| commit | d95ed633e381029eae89241b6ef22e82dcaa3623 (patch) | |
| tree | 1cb19b1217488ab437f80aed804f51a10eeef1d6 | |
| parent | 6520848d003a15ba47e603eee1d28810f187028c (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini2440-d95ed633e381029eae89241b6ef22e82dcaa3623.tar.gz OSELAS.BSP-Pengutronix-Mini2440-d95ed633e381029eae89241b6ef22e82dcaa3623.tar.xz | |
Kernel-3.4: keep in sync with stable release 3.4.36
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | kernelconfig-3.4 | 2 | ||||
| -rw-r--r-- | patches/linux-3.4/patch-3.4.35-36.bz2 | bin | 0 -> 12656 bytes | |||
| -rw-r--r-- | patches/linux-3.4/series | 1 | ||||
| -rw-r--r-- | patches/linux-3.4/set-marker.diff | 2 | ||||
| -rw-r--r-- | plain_sources/special_notes.tex | 2 |
6 files changed, 6 insertions, 3 deletions
@@ -2,6 +2,8 @@ * Kernel 3.0: - keep in sync with stable release .69 + * Kernel 3.4: + - keep in sync with stable release .36 2013-03-07 Juergen Beisert <jbe@pengutronix.de diff --git a/kernelconfig-3.4 b/kernelconfig-3.4 index 7e46f5d..76ddb82 100644 --- a/kernelconfig-3.4 +++ b/kernelconfig-3.4 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.35-ptx-master Kernel Configuration +# Linux/arm 3.4.36-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y diff --git a/patches/linux-3.4/patch-3.4.35-36.bz2 b/patches/linux-3.4/patch-3.4.35-36.bz2 Binary files differnew file mode 100644 index 0000000..7aad0eb --- /dev/null +++ b/patches/linux-3.4/patch-3.4.35-36.bz2 diff --git a/patches/linux-3.4/series b/patches/linux-3.4/series index 7345924..b4ff070 100644 --- a/patches/linux-3.4/series +++ b/patches/linux-3.4/series @@ -34,6 +34,7 @@ patch-3.4.31-32.bz2 patch-3.4.32-33.bz2 patch-3.4.33-34.bz2 patch-3.4.34-35.bz2 +patch-3.4.35-36.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 ba70c2a..820c444 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 = 35 + SUBLEVEL = 36 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Saber-toothed Squirrel diff --git a/plain_sources/special_notes.tex b/plain_sources/special_notes.tex index cfbaf7e..d5a63bf 100644 --- a/plain_sources/special_notes.tex +++ b/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 35 + \item 3.4, stable patch level 36 \item 3.3 *), stable patch level 8 \item 3.2, stable patch level 40 \item 3.1 *), stable patch level 10 |