]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge tag 'v3.16-rc5' into sched/core, to refresh the branch before applying bigger...
authorIngo Molnar <mingo@kernel.org>
Wed, 16 Jul 2014 13:10:07 +0000 (15:10 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 16 Jul 2014 13:10:07 +0000 (15:10 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/fork.c
kernel/smp.c

diff --cc kernel/fork.c
Simple merge
diff --cc kernel/smp.c
Simple merge