Merge branch 'linus' into sched/core, to resolve conflicts

Conflicts:
	kernel/sysctl.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2014-02-02 09:45:39 +01:00
commit eaa4e4fcf1
9123 changed files with 554741 additions and 239979 deletions

Some files were not shown because too many files have changed in this diff Show more