summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-05-29 21:22:37 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-05-29 21:22:37 +0200
commit53b3c1b45c291b127cbc53f015ba82475af8907f (patch)
treeeeb5a80bc0e2b7717abd1a1f8ed4d3f7667975e9
parent77ea4dcdaac13f2005bc48adccb3221a9e851eec (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-53b3c1b45c291b127cbc53f015ba82475af8907f.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-53b3c1b45c291b127cbc53f015ba82475af8907f.tar.xz
Kernel-3.0: keep in sync with stable release 3.0.80
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.79-80.bz2bin0 -> 1131 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 3b1f03e..fd46b2c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+2013-05-29 Juergen Beisert <jbe@pengutronix.de
+
+ * Kernel 3.0:
+ - keep in sync with stable release .80
+
2013-05-21 Juergen Beisert <jbe@pengutronix.de
* Kernel 3.0:
diff --git a/kernelconfig-3.0 b/kernelconfig-3.0
index bb5bd12..13625d7 100644
--- a/kernelconfig-3.0
+++ b/kernelconfig-3.0
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.79-ptx-master Kernel Configuration
+# Linux/arm 3.0.80-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.0/patch-3.0.79-80.bz2 b/patches/linux-3.0/patch-3.0.79-80.bz2
new file mode 100644
index 0000000..b9101d0
--- /dev/null
+++ b/patches/linux-3.0/patch-3.0.79-80.bz2
Binary files differ
diff --git a/patches/linux-3.0/series b/patches/linux-3.0/series
index a7cc179..548e582 100644
--- a/patches/linux-3.0/series
+++ b/patches/linux-3.0/series
@@ -78,6 +78,7 @@ patch-3.0.75-76.bz2
patch-3.0.76-77.bz2
patch-3.0.77-78.bz2
patch-3.0.78-79.bz2
+patch-3.0.79-80.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 6e33f1d..6a64e21 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 = 79
+ SUBLEVEL = 80
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Sneaky Weasel
diff --git a/plain_sources/special_notes.tex b/plain_sources/special_notes.tex
index 870e1cb..457c9ef 100644
--- a/plain_sources/special_notes.tex
+++ b/plain_sources/special_notes.tex
@@ -41,7 +41,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\item 3.3 *), stable patch level 8
\item 3.2, stable patch level 45
\item 3.1 *), stable patch level 10
- \item 3.0, stable patch level 79
+ \item 3.0, stable patch level 80
\item 2.6.39 *), stable patch level 4
\item 2.6.38 *), stable patch level 8
\end{itemize}