Kernel-3.1: keep in sync with stable release 3.1.10

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>

10 files changed, 39 insertions, 5 deletions

diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog
index ceff660..cd1baa1 100644
--- a/configs/platform-friendlyarm-mini6410/Changelog
+++ b/configs/platform-friendlyarm-mini6410/Changelog
@@ -2,6 +2,8 @@
 
 	* Kernel 3.0:
 		- keep in sync with stable release .32
+	* Kernel 3.1:
+		- keep in sync with stable release .10
 
 2011-12-26	Juergen Beisert <jbe@pengutronix.de>
 
diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.1 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.1
index 4aca130..ddff829 100644
--- a/configs/platform-friendlyarm-mini6410/kernelconfig-3.1
+++ b/configs/platform-friendlyarm-mini6410/kernelconfig-3.1
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.1.6-ptx-master Kernel Configuration
+# Linux/arm 3.1.10-ptx-master Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -1212,7 +1212,35 @@ CONFIG_BACKLIGHT_TINY6410=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_LOGO is not set
-# CONFIG_SOUND is not set
+CONFIG_SOUND=y
+# CONFIG_SOUND_OSS_CORE is not set
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=y
+# CONFIG_SND_SEQ_DUMMY is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_SEQUENCER_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+CONFIG_SND_SOC=y
+# CONFIG_SND_SOC_CACHE_LZO is not set
+CONFIG_SND_SOC_SAMSUNG=y
+CONFIG_SND_SOC_I2C_AND_SPI=y
+# CONFIG_SND_SOC_ALL_CODECS is not set
+# CONFIG_SOUND_PRIME is not set
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_USB_ARCH_HAS_OHCI=y
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.6-7.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.6-7.bz2
new file mode 100644
index 0000000..c80517e
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.6-7.bz2
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.7-8.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.7-8.bz2
new file mode 100644
index 0000000..5038a98
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.7-8.bz2
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.8-9.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.8-9.bz2
new file mode 100644
index 0000000..b584dee
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.8-9.bz2
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.9-10.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.9-10.bz2
new file mode 100644
index 0000000..2673d50
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.9-10.bz2
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series
index a666968..49d877e 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series
@@ -5,6 +5,10 @@ patch-3.1.2-3.bz2
 patch-3.1.3-4.bz2
 patch-3.1.4-5.bz2
 patch-3.1.5-6.bz2
+patch-3.1.6-7.bz2
+patch-3.1.7-8.bz2
+patch-3.1.8-9.bz2
+patch-3.1.9-10.bz2
 
 # some fixes, occured on LKML/ALKML
 PATCH_2_3_rtc-s3c_Disable_alarm_entries_that_are_not_chosen.diff
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff
index 2a64ecf..1d1798f 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.1/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 1
- SUBLEVEL = 6
+ SUBLEVEL = 10
 -EXTRAVERSION =
 +EXTRAVERSION = -ptx-master
  NAME = "Divemaster Edition"
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index e432a82..edb9110 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -32,7 +32,7 @@ they are also available. Here is a list of currently available Linux kernel
 releases in the \ptxdistBSPName{}:
 
 \begin{itemize}
-	\item \curKernelRev{}, stable patch level 6 (defaultl)
+	\item \curKernelRev{}, stable patch level 10 (defaultl)
 	\item 3.0, stable patch level 32
 	\item 2.6.39, stable patch level 4
 \end{itemize}
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index 4d330ed..cbd856f 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -26,7 +26,7 @@ Preparations
 Base System
 -----------
 
-[ ] kernel-3.1.6 is a release
+[ ] kernel-3.1.10 is a release
 [ ] kernel-3.0.32 is a release
 [x] kernel-2.6.39.4 is a release
 [x] u-boot-1.1.6 is a release