Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 17 Jul 2008 17:24:56 +0000 (19:24 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Jul 2008 17:24:56 +0000 (19:24 +0200)

Trivial merge