kernel/sysctl.c · 971eae7c99212dd67b425a603f1fe3b763359907 · Kirill Smelkov / linux · GitLab

Find file Blame History Permalink

Merge branch 'linus' into sched/core, to resolve conflicts · eaa4e4fc
Ingo Molnar authored Feb 02, 2014
```
Conflicts:
	kernel/sysctl.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
```
eaa4e4fc