diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2013-05-29 21:23:51 +0200 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2013-06-12 12:14:08 +0200 |
| commit | 5e08d651a3bd4a5e716e2a1e654fe412e0a72a49 (patch) | |
| tree | 2731abfab1ef5b164ac9080450dd9fd01419da9f | |
| parent | 3fbb31748f1f8808a17c94d6e91c538b526f45d0 (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini2440-5e08d651a3bd4a5e716e2a1e654fe412e0a72a49.tar.gz OSELAS.BSP-Pengutronix-Mini2440-5e08d651a3bd4a5e716e2a1e654fe412e0a72a49.tar.xz | |
Kernel-3.4: keep in sync with stable release 3.4.47
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.46-47.bz2 | bin | 0 -> 1872 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
@@ -2,6 +2,8 @@ * Kernel 3.0: - keep in sync with stable release .80 + * Kernel 3.4: + - keep in sync with stable release .47 2013-05-21 Juergen Beisert <jbe@pengutronix.de diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index 457c9ef..b417dc6 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -37,7 +37,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 46 + \item 3.4, stable patch level 47 \item 3.3 *), stable patch level 8 \item 3.2, stable patch level 45 \item 3.1 *), stable patch level 10 diff --git a/kernelconfig-3.4 b/kernelconfig-3.4 index a8f659c..6724db6 100644 --- a/kernelconfig-3.4 +++ b/kernelconfig-3.4 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.46-ptx-master Kernel Configuration +# Linux/arm 3.4.47-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y diff --git a/patches/linux-3.4/patch-3.4.46-47.bz2 b/patches/linux-3.4/patch-3.4.46-47.bz2 Binary files differnew file mode 100644 index 0000000..0aa55b6 --- /dev/null +++ b/patches/linux-3.4/patch-3.4.46-47.bz2 diff --git a/patches/linux-3.4/series b/patches/linux-3.4/series index f01587c..3c8ba53 100644 --- a/patches/linux-3.4/series +++ b/patches/linux-3.4/series @@ -45,6 +45,7 @@ patch-3.4.42-43.bz2 patch-3.4.43-44.bz2 patch-3.4.44-45.bz2 patch-3.4.45-46.bz2 +patch-3.4.46-47.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 46478d7..025b0cd 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 = 46 + SUBLEVEL = 47 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Saber-toothed Squirrel |