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
..
asm	Merge branch 'linus' into sched/core, to resolve conflict	2015-06-02 08:05:42 +02:00
uapi/asm	sparc: hook up execveat system call	2014-12-13 12:42:51 -08:00