]> err.no Git - linux-2.6/commitdiff
Merge branch 'linus' into sched/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 31 Jul 2008 16:34:22 +0000 (18:34 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 31 Jul 2008 16:34:22 +0000 (18:34 +0200)

Trivial merge