| commit | f407a8258610169cd8e975dba7f0b2824562014c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Tue Jun 02 08:05:42 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Tue Jun 02 08:05:42 2015 +0200 |
| tree | 6c87b2d168a4665411a9e16b9f481599f2db25bc | |
| parent | 960d447b94b22ceba286917056871d1dac8da697 [diff] | |
| parent | c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 [diff] |
Merge branch 'linus' into sched/core, to resolve conflict Conflicts: arch/sparc/include/asm/topology_64.h Signed-off-by: Ingo Molnar <mingo@kernel.org>