Ingo Molnar f407a82586 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>
2015-06-02 08:05:42 +02:00
..
2014-09-08 09:55:37 -06:00
2014-09-08 09:55:37 -06:00
2015-02-05 10:14:54 -07:00
2015-03-20 08:50:41 -06:00
2015-01-23 14:18:00 -07:00
2015-02-04 09:57:52 -07:00
2015-04-11 22:27:13 -04:00