]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'sched/urgent' into sched/core
authorThomas Gleixner <tglx@linutronix.de>
Mon, 13 Aug 2012 16:56:46 +0000 (18:56 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 13 Aug 2012 16:56:46 +0000 (18:56 +0200)
1  2 
kernel/sched/core.c

Simple merge