]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into sched/urgent
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Dec 2009 17:33:49 +0000 (18:33 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Dec 2009 17:33:49 +0000 (18:33 +0100)
commit9a9654f615224f5066231917a7f63ae580d29b54
treeb8771cc5a9758af9d7410fc519227c036c222130
parent837fe5261078b44bf947e9ba9ce80d035de52c9a
parente41d60be9dd7201fe324af094fa3bf31cfaf88a6
Merge branch 'linus' into sched/urgent

Conflicts:
kernel/sched_idletask.c

Merge reason: resolve the conflicts, pick up latest changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/sched.c
kernel/sched_idletask.c