projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f67d96 d158fc7)
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)
Reason: Bring bakc upstream modification to resolve conflicts

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1  2 
arch/powerpc/platforms/pseries/setup.c patch | diff1 | diff2 | blob | history
include/linux/sched.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/sched.h
Simple merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules