summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-04-17 19:56:09 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-04-17 19:56:09 +0200
commit9251a489dcf31d997541fe8bae654a1e21d2338a (patch)
tree914193506b4ea0fe68c97cb857967a64ffa03db8
parentef5ca86888bfee2a4b9e6c82da6977c3f31d0d45 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-9251a489dcf31d997541fe8bae654a1e21d2338a.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-9251a489dcf31d997541fe8bae654a1e21d2338a.tar.xz
Kernel-3.0: keep in sync with stable release 3.0.74
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--Changelog5
-rw-r--r--kernelconfig-3.02
-rw-r--r--patches/linux-3.0/patch-3.0.73-74.bz2bin0 -> 6282 bytes
-rw-r--r--patches/linux-3.0/series1
-rw-r--r--patches/linux-3.0/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 f8f4600..2749bd3 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+2013-04-17 Juergen Beisert <jbe@pengutronix.de
+
+ * Kernel 3.0:
+ - keep in sync with stable release .74
+
2013-04-14 Juergen Beisert <jbe@pengutronix.de
* Kernel 3.0:
diff --git a/kernelconfig-3.0 b/kernelconfig-3.0
index 266b9af..288e904 100644
--- a/kernelconfig-3.0
+++ b/kernelconfig-3.0
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.73-ptx-master Kernel Configuration
+# Linux/arm 3.0.74-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.0/patch-3.0.73-74.bz2 b/patches/linux-3.0/patch-3.0.73-74.bz2
new file mode 100644
index 0000000..deef678
--- /dev/null
+++ b/patches/linux-3.0/patch-3.0.73-74.bz2
Binary files differ
diff --git a/patches/linux-3.0/series b/patches/linux-3.0/series
index 40f91e2..dc7d18f 100644
--- a/patches/linux-3.0/series
+++ b/patches/linux-3.0/series
@@ -72,6 +72,7 @@ patch-3.0.69-70.bz2
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_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 357b646..7602f69 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 = 73
+ SUBLEVEL = 74
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Sneaky Weasel
diff --git a/plain_sources/special_notes.tex b/plain_sources/special_notes.tex
index 13b3525..91ca0ad 100644
--- a/plain_sources/special_notes.tex
+++ b/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 73
+ \item 3.0, stable patch level 74
\item 2.6.39 *), stable patch level 4
\item 2.6.38 *), stable patch level 8
\end{itemize}