summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-05-14 19:13:43 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-06-12 12:14:08 +0200
commite082df3b5c2d4f5f41acbf1e2d166f4971513eca (patch)
tree3d3a3adcb9b8f6d7e050be7dd6076af1b3687092
parent6bc53dcb9ee2fcb9b96f80a38297086d6312e473 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-e082df3b5c2d4f5f41acbf1e2d166f4971513eca.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-e082df3b5c2d4f5f41acbf1e2d166f4971513eca.tar.xz
Kernel-3.2: keep in sync with stable release 3.2.45
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--Changelog7
-rw-r--r--documentation/plain_sources/special_notes.tex2
-rw-r--r--kernelconfig-3.22
-rw-r--r--patches/linux-3.2/patch-3.2.44-45.bz2bin0 -> 35553 bytes
-rw-r--r--patches/linux-3.2/series1
-rw-r--r--patches/linux-3.2/set-marker.diff2
6 files changed, 10 insertions, 4 deletions
diff --git a/Changelog b/Changelog
index 3531e29..c231d1d 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+2013-05-14 Juergen Beisert <jbe@pengutronix.de
+
+ * Kernel 3.2:
+ - keep in sync with stable release .45
+
2013-05-13 Juergen Beisert <jbe@pengutronix.de
* Kernel 3.0:
@@ -34,7 +39,7 @@
* Kernel 3.0:
- keep in sync with stable release .75
* Kernel 3.2:
- - keep in sync with stable release .43
+ - keep in sync with stable release .44
* Kernel 3.4:
- keep in sync with stable release .42
* Kernel 3.8:
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 952fc85..dc454e0 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -39,7 +39,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\item 3.5 *), stable patch level 7
\item 3.4, stable patch level 45
\item 3.3 *), stable patch level 8
- \item 3.2, stable patch level 44
+ \item 3.2, stable patch level 45
\item 3.1 *), stable patch level 10
\item 3.0, stable patch level 78
\item 2.6.39 *), stable patch level 4
diff --git a/kernelconfig-3.2 b/kernelconfig-3.2
index 52ac6aa..229d624 100644
--- a/kernelconfig-3.2
+++ b/kernelconfig-3.2
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.44-ptx-master Kernel Configuration
+# Linux/arm 3.2.45-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.2/patch-3.2.44-45.bz2 b/patches/linux-3.2/patch-3.2.44-45.bz2
new file mode 100644
index 0000000..8391e7b
--- /dev/null
+++ b/patches/linux-3.2/patch-3.2.44-45.bz2
Binary files differ
diff --git a/patches/linux-3.2/series b/patches/linux-3.2/series
index 34a64d9..0283bb5 100644
--- a/patches/linux-3.2/series
+++ b/patches/linux-3.2/series
@@ -43,6 +43,7 @@ patch-3.2.40-41.bz2
patch-3.2.41-42.bz2
patch-3.2.42-43.bz2
patch-3.2.43-44.bz2
+patch-3.2.44-45.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 1d5c05a..f9f9efd 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 = 44
+ SUBLEVEL = 45
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Saber-toothed Squirrel