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
..
2015-04-24 07:58:07 -07:00
2015-04-16 18:48:55 -04:00
2015-05-19 15:42:25 +02:00
2015-04-16 13:53:32 -05:00