]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into sched/core
authorThomas Gleixner <tglx@linutronix.de>
Fri, 21 Feb 2014 20:36:40 +0000 (21:36 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 21 Feb 2014 20:37:09 +0000 (21:37 +0100)
commit31b620484e1993f03f6936bca56066b17b410e9d
tree90c2155ec5a1f3115a9eb7a86f25d1a4610227c6
parent452eeb383e2f5a6fd3c640840ca65e2a6e2244af
parent0b13d385d233695d46e9aad1f3ca453ad702839a
Merge branch 'linus' into sched/core

Reason: Bring bakc upstream modification to resolve conflicts

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/powerpc/platforms/pseries/setup.c
include/linux/sched.h