]> err.no Git - linux-2.6/commitdiff
Merge branch 'sched/urgent' into sched/clock
authorIngo Molnar <mingo@elte.hu>
Wed, 30 Jul 2008 08:38:30 +0000 (10:38 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 30 Jul 2008 08:38:30 +0000 (10:38 +0200)

Trivial merge