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)
commitd97a860c4f3de98ba5040a22f305b7159fe17cff
tree90c2155ec5a1f3115a9eb7a86f25d1a4610227c6
parent3f67d962c64d9b6de9dab81bdbe6d5c94c80d9b9
parentd158fc7f36a25e19791d25a55da5623399a2644f
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