]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1de8644 543cf4c)
Merge branch 'linus' into sched/devel
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:26:59 +0000 (12:26 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:26:59 +0000 (12:26 +0200)
Conflicts:

kernel/sched_rt.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
kernel/sched.c patch | diff1 | diff2 | blob | history

diff --cc kernel/sched.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.