Merge branch 'linus' into sched/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 19 Jun 2008 07:37:31 +0000 (09:37 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 19 Jun 2008 07:37:31 +0000 (09:37 +0200)

Trivial merge