kernel: update linux 3.6 to 3.6.11

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34748 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 4 insertions, 67 deletions

diff --git a/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch b/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch
deleted file mode 100644
index 3afff7138..000000000
--- a/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 961a7aeafab477f63d9eef26afde9cbb8badcd0f Mon Sep 17 00:00:00 2001
-From: Peter Ujfalusi <peter.ujfalusi@ti.com>
-Date: Mon, 1 Oct 2012 12:29:26 +0300
-Subject: [PATCH] ASoC: dmaengine: Correct Makefile when sound is built as
- module
-
-soc-dmaengine-pcm library need to be part of the snd-soc-core in order to
-be able to compile ASoC as modules when dmaengine is enabled on the platform.
-
-Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
-Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
----
- sound/soc/Makefile |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/sound/soc/Makefile
-+++ b/sound/soc/Makefile
-@@ -1,8 +1,9 @@
- snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o
- snd-soc-core-objs += soc-pcm.o soc-io.o
- 
--snd-soc-dmaengine-pcm-objs := soc-dmaengine-pcm.o
--obj-$(CONFIG_SND_SOC_DMAENGINE_PCM) += snd-soc-dmaengine-pcm.o
-+ifneq ($(CONFIG_SND_SOC_DMAENGINE_PCM),)
-+snd-soc-core-objs += soc-dmaengine-pcm.o
-+endif
- 
- obj-$(CONFIG_SND_SOC)	+= snd-soc-core.o
- obj-$(CONFIG_SND_SOC)	+= codecs/
diff --git a/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch b/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch
deleted file mode 100644
index f95e06dca..000000000
--- a/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 07b9a6cde27d690ea3331fc2ca2778902d929aaa Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 10 Dec 2012 20:55:54 +0100
-Subject: [PATCH] Input: matrix-keymap - provide a proper module license
-
-The matrix-keymap module is currently lacking a proper module license,
-add one so we don't have this module tainting the entire kernel. This
-issue has been present since commit 1932811f (Input: matrix-keymap -
-uninline and prepare for device tree support)
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
-CC: stable@vger.kernel.org
----
-Dmitry, can you try to push this to Linus before 3.7 final? Thank you
-
- drivers/input/matrix-keymap.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/input/matrix-keymap.c
-+++ b/drivers/input/matrix-keymap.c
-@@ -23,6 +23,7 @@
- #include <linux/input.h>
- #include <linux/of.h>
- #include <linux/export.h>
-+#include <linux/module.h>
- #include <linux/input/matrix_keypad.h>
- 
- static bool matrix_keypad_map_key(struct input_dev *input_dev,
-@@ -161,3 +162,5 @@ int matrix_keypad_build_keymap(const str
- 	return 0;
- }
- EXPORT_SYMBOL(matrix_keypad_build_keymap);
-+
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic/patches-3.6/901-debloat_sock_diag.patch b/target/linux/generic/patches-3.6/901-debloat_sock_diag.patch
index 8f161ba1a..04da4ef12 100644
--- a/target/linux/generic/patches-3.6/901-debloat_sock_diag.patch
+++ b/target/linux/generic/patches-3.6/901-debloat_sock_diag.patch
@@ -12,7 +12,7 @@
  	help
 --- a/net/core/Makefile
 +++ b/net/core/Makefile
-@@ -8,9 +8,9 @@ obj-y := sock.o request_sock.o skbuff.o 
+@@ -8,9 +8,9 @@ obj-y := sock.o request_sock.o skbuff.o
  obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
  
  obj-y		     += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
diff --git a/target/linux/generic/patches-3.6/902-debloat_proc.patch b/target/linux/generic/patches-3.6/902-debloat_proc.patch
index a8ff00cfe..5133a107d 100644
--- a/target/linux/generic/patches-3.6/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.6/902-debloat_proc.patch
@@ -122,7 +122,7 @@
  		return -ENOMEM;
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
-@@ -2641,6 +2641,8 @@ static const struct file_operations proc
+@@ -2639,6 +2639,8 @@ static const struct file_operations proc
  
  static int __init proc_vmalloc_init(void)
  {
diff --git a/target/linux/generic/patches-3.6/950-vm_exports.patch b/target/linux/generic/patches-3.6/950-vm_exports.patch
index ba363c11b..a49a2f779 100644
--- a/target/linux/generic/patches-3.6/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.6/950-vm_exports.patch
@@ -1,6 +1,6 @@
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
-@@ -2914,6 +2914,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
+@@ -2920,6 +2920,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
  
  /* common code */
  
@@ -17,7 +17,7 @@
  /**
   * shmem_file_setup - get an unlinked file living in tmpfs
   * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2991,11 +3001,8 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2997,11 +3007,8 @@ int shmem_zero_setup(struct vm_area_stru
  	if (IS_ERR(file))
  		return PTR_ERR(file);