From: Imre Kaloz <kaloz@openwrt.org>
Date: Sat, 11 Feb 2012 17:43:06 +0000 (+0000)
Subject: refresh patches to -rc3
X-Git-Tag: attitude_adjustment_12.09~2414
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=440a7fbc3bfd2489fd9e5eb7329557c86e34ae6d;p=openwrt%2Fsvn-archive%2Fopenwrt.git

refresh patches to -rc3

SVN-Revision: 30456
---

diff --git a/target/linux/generic/patches-3.3/100-overlayfs_v12.patch b/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
index b7508e6639..5eda87c8d6 100644
--- a/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
+++ b/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
@@ -244,7 +244,7 @@
  ========================
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -4930,6 +4930,13 @@ F:	drivers/scsi/osd/
+@@ -4924,6 +4924,13 @@ F:	drivers/scsi/osd/
  F:	include/scsi/osd_*
  F:	fs/exofs/
  
diff --git a/target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch b/target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
index 07b5f76688..1659fda937 100644
--- a/target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
+++ b/target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
@@ -1,6 +1,6 @@
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -204,16 +204,16 @@ config BCH_CONST_T
+@@ -207,16 +207,16 @@ config BCH_CONST_T
  # Textsearch support is select'ed if needed
  #
  config TEXTSEARCH
diff --git a/target/linux/generic/patches-3.3/400-rootfs_split.patch b/target/linux/generic/patches-3.3/400-rootfs_split.patch
index debe930452..349185a30d 100644
--- a/target/linux/generic/patches-3.3/400-rootfs_split.patch
+++ b/target/linux/generic/patches-3.3/400-rootfs_split.patch
@@ -290,7 +290,7 @@
  	/*
  	 * If the driver is something smart, like UBI, it may need to maintain
  	 * its own reference counting. The below functions are only for driver.
-@@ -504,6 +508,7 @@ extern int mtd_device_parse_register(str
+@@ -502,6 +506,7 @@ extern int mtd_device_parse_register(str
  			      int defnr_parts);
  #define mtd_device_register(master, parts, nr_parts)	\
  	mtd_device_parse_register(master, NULL, NULL, parts, nr_parts)
diff --git a/target/linux/generic/patches-3.3/510-jffs2_make_lzma_available.patch b/target/linux/generic/patches-3.3/510-jffs2_make_lzma_available.patch
index c51be07180..fa79ba313d 100644
--- a/target/linux/generic/patches-3.3/510-jffs2_make_lzma_available.patch
+++ b/target/linux/generic/patches-3.3/510-jffs2_make_lzma_available.patch
@@ -1049,7 +1049,7 @@
 +#endif
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -115,6 +115,12 @@ config LZO_DECOMPRESS
+@@ -118,6 +118,12 @@ config LZO_DECOMPRESS
  
  source "lib/xz/Kconfig"
  
diff --git a/target/linux/generic/patches-3.3/863-gpiommc.patch b/target/linux/generic/patches-3.3/863-gpiommc.patch
index 9a5f811a75..3052a38302 100644
--- a/target/linux/generic/patches-3.3/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.3/863-gpiommc.patch
@@ -830,7 +830,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3025,6 +3025,11 @@ L:	linuxppc-dev@lists.ozlabs.org
+@@ -3019,6 +3019,11 @@ L:	linuxppc-dev@lists.ozlabs.org
  S:	Odd Fixes
  F:	drivers/tty/hvc/
  
diff --git a/target/linux/generic/patches-3.3/950-vm_exports.patch b/target/linux/generic/patches-3.3/950-vm_exports.patch
index f0d9a64bf1..5b5a17728a 100644
--- a/target/linux/generic/patches-3.3/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.3/950-vm_exports.patch
@@ -61,7 +61,7 @@
  {
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -3861,6 +3861,7 @@ int can_nice(const struct task_struct *p
+@@ -3856,6 +3856,7 @@ int can_nice(const struct task_struct *p
  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
  		capable(CAP_SYS_NICE));
  }