summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-04-29 16:53:26 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-06-12 12:14:06 +0200
commitdac1c0e50a50b052ca4f7c6c05d60134a4712a21 (patch)
tree26f6b4f0cba4e864dbb553040e20534b242438ea
parentc39e345e76be0bc2a16c73e7af26d00a2ce03693 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-dac1c0e50a50b052ca4f7c6c05d60134a4712a21.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-dac1c0e50a50b052ca4f7c6c05d60134a4712a21.tar.xz
Kernel-3.0: keep in sync with stable release 3.0.75
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--Changelog5
-rw-r--r--documentation/plain_sources/special_notes.tex2
-rw-r--r--kernelconfig-3.02
-rw-r--r--patches/linux-3.0/patch-3.0.74-75.bz2bin0 -> 9391 bytes
-rw-r--r--patches/linux-3.0/series1
-rw-r--r--patches/linux-3.0/set-marker.diff2
6 files changed, 9 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index 1e94451..456c6ac 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+2013-04-29 Juergen Beisert <jbe@pengutronix.de
+
+ * Kernel 3.0:
+ - keep in sync with stable release .75
+
2013-04-17 Juergen Beisert <jbe@pengutronix.de
* Kernel 3.0:
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 7f54aa4..4009d16 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -40,7 +40,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\item 3.3 *), stable patch level 8
\item 3.2, stable patch level 43
\item 3.1 *), stable patch level 10
- \item 3.0, stable patch level 74
+ \item 3.0, stable patch level 75
\item 2.6.39 *), stable patch level 4
\item 2.6.38 *), stable patch level 8
\end{itemize}
diff --git a/kernelconfig-3.0 b/kernelconfig-3.0
index 288e904..d04201f 100644
--- a/kernelconfig-3.0
+++ b/kernelconfig-3.0
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.74-ptx-master Kernel Configuration
+# Linux/arm 3.0.75-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.0/patch-3.0.74-75.bz2 b/patches/linux-3.0/patch-3.0.74-75.bz2
new file mode 100644
index 0000000..34ac2d3
--- /dev/null
+++ b/patches/linux-3.0/patch-3.0.74-75.bz2
Binary files differ
diff --git a/patches/linux-3.0/series b/patches/linux-3.0/series
index dc7d18f..e61e198 100644
--- a/patches/linux-3.0/series
+++ b/patches/linux-3.0/series
@@ -73,6 +73,7 @@ patch-3.0.70-71.bz2
patch-3.0.71-72.bz2
patch-3.0.72-73.bz2
patch-3.0.73-74.bz2
+patch-3.0.74-75.bz2
PATCH_1_4_s3c2440_mini2440_Add_support_for_new_LCD_panels.diff
add_lcd_w35i.diff
diff --git a/patches/linux-3.0/set-marker.diff b/patches/linux-3.0/set-marker.diff
index 7602f69..85314d0 100644
--- a/patches/linux-3.0/set-marker.diff
+++ b/patches/linux-3.0/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.0/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 0
- SUBLEVEL = 74
+ SUBLEVEL = 75
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Sneaky Weasel