summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-05-31 21:18:36 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-05-31 21:18:36 +0200
commit4a6f4145c43896875135e7e460808f2256cda8c0 (patch)
tree3df49ae0489ba2d10c477f141ff1a3e5722824b0
parent533528c1f8c0c3558e4efa2d4aa41283372b4ab1 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-platform-friendlyarm-mini2440.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-platform-friendlyarm-mini2440.tar.xz
Kernel-3.2: keep in sync with stable release 3.2.46platform-friendlyarm-mini2440
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--Changelog5
-rw-r--r--kernelconfig-3.22
-rw-r--r--patches/linux-3.2/patch-3.2.45-46.bz2bin0 -> 30668 bytes
-rw-r--r--patches/linux-3.2/series1
-rw-r--r--patches/linux-3.2/set-marker.diff2
-rw-r--r--plain_sources/special_notes.tex2
6 files changed, 9 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index a769735..9275d10 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+2013-05-30 Juergen Beisert <jbe@pengutronix.de
+
+ * Kernel 3.2:
+ - keep in sync with stable release .46
+
2013-05-29 Juergen Beisert <jbe@pengutronix.de
* Kernel 3.0:
diff --git a/kernelconfig-3.2 b/kernelconfig-3.2
index 229d624..a102842 100644
--- a/kernelconfig-3.2
+++ b/kernelconfig-3.2
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.45-ptx-master Kernel Configuration
+# Linux/arm 3.2.46-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.2/patch-3.2.45-46.bz2 b/patches/linux-3.2/patch-3.2.45-46.bz2
new file mode 100644
index 0000000..15f99c2
--- /dev/null
+++ b/patches/linux-3.2/patch-3.2.45-46.bz2
Binary files differ
diff --git a/patches/linux-3.2/series b/patches/linux-3.2/series
index 0283bb5..dfd9d0c 100644
--- a/patches/linux-3.2/series
+++ b/patches/linux-3.2/series
@@ -44,6 +44,7 @@ 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-3.2.45-46.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 f9f9efd..bdd5f0a 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 = 45
+ SUBLEVEL = 46
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Saber-toothed Squirrel
diff --git a/plain_sources/special_notes.tex b/plain_sources/special_notes.tex
index 522fab0..60cc706 100644
--- a/plain_sources/special_notes.tex
+++ b/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 47
\item 3.3 *), stable patch level 8
- \item 3.2, stable patch level 45
+ \item 3.2, stable patch level 46
\item 3.1 *), stable patch level 10
\item 3.0, stable patch level 80
\item 2.6.39 *), stable patch level 4