projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eebef74 396e894)
Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@elte.hu>
Thu, 5 Aug 2010 07:46:29 +0000 (09:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 5 Aug 2010 07:46:29 +0000 (09:46 +0200)
commit0bcfe75807944106a3aa655a54bb610d62f3a7f5
treed48d848e09d1bf48fe7fa23e9226f38ef342eed4tree | snapshot
parenteebef74695e1498e04e5f85be9c6f84bd2e7358acommit | diff
parent396e894d289d69bacf5acd983c97cd6e21a14c08commit | diff
Merge branch 'sched/urgent' into sched/core

Conflicts:
include/linux/sched.h

Merge reason: Add the leftover .35 urgent bits, fix the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/sched.h diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
kernel/time/tick-sched.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.