refresh patches to -rc3

SVN-Revision: 30456
owl
Imre Kaloz 2012-02-11 17:43:06 +00:00
parent 4e1b870f3e
commit 440a7fbc3b
6 changed files with 6 additions and 6 deletions

View File

@ -244,7 +244,7 @@
======================== ========================
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -4930,6 +4930,13 @@ F: drivers/scsi/osd/ @@ -4924,6 +4924,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_* F: include/scsi/osd_*
F: fs/exofs/ F: fs/exofs/

View File

@ -1,6 +1,6 @@
--- a/lib/Kconfig --- a/lib/Kconfig
+++ b/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 # Textsearch support is select'ed if needed
# #
config TEXTSEARCH config TEXTSEARCH

View File

@ -290,7 +290,7 @@
/* /*
* If the driver is something smart, like UBI, it may need to maintain * If the driver is something smart, like UBI, it may need to maintain
* its own reference counting. The below functions are only for driver. * 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); int defnr_parts);
#define mtd_device_register(master, parts, nr_parts) \ #define mtd_device_register(master, parts, nr_parts) \
mtd_device_parse_register(master, NULL, NULL, parts, nr_parts) mtd_device_parse_register(master, NULL, NULL, parts, nr_parts)

View File

@ -1049,7 +1049,7 @@
+#endif +#endif
--- a/lib/Kconfig --- a/lib/Kconfig
+++ b/lib/Kconfig +++ b/lib/Kconfig
@@ -115,6 +115,12 @@ config LZO_DECOMPRESS @@ -118,6 +118,12 @@ config LZO_DECOMPRESS
source "lib/xz/Kconfig" source "lib/xz/Kconfig"

View File

@ -830,7 +830,7 @@
+be done automatically. +be done automatically.
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/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 S: Odd Fixes
F: drivers/tty/hvc/ F: drivers/tty/hvc/

View File

@ -61,7 +61,7 @@
{ {
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/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) || return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE)); capable(CAP_SYS_NICE));
} }