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>

Trivial merge