| commit | eaa4e4fcf1b5c60e656d93242f7fe422173f25b2 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sun Feb 02 09:45:39 2014 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Sun Feb 02 09:45:39 2014 +0100 |
| tree | c05d5d6ca3f625d72a9d136b4c485d3dc9472089 | |
| parent | be1e4e760d940c14d119bffef5eb007dfdf29046 [diff] | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 [diff] |
Merge branch 'linus' into sched/core, to resolve conflicts Conflicts: kernel/sysctl.c Signed-off-by: Ingo Molnar <mingo@kernel.org>