Merge commit 'v2.6.37-rc3' into perf/core

Merge reason: Pick up latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2010-11-26 15:04:42 +01:00
commit e4e91ac410
412 changed files with 2474 additions and 1329 deletions

View file

@ -702,7 +702,6 @@ static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &ten_thousand,
},
#endif
{
.procname = "dmesg_restrict",
.data = &dmesg_restrict,
@ -712,6 +711,7 @@ static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &one,
},
#endif
{
.procname = "ngroups_max",
.data = &ngroups_max,