]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
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)
commitf57aec5a871907427060196f6bac3d0011b38450
treefec11fec6cf8e2454e07bd04ac137cad85075611
parent1de8644cc7c826e0c41e52825bd5a12e2e31e6ca
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into sched/devel

Conflicts:

kernel/sched_rt.c

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