Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 25 Aug 2008 12:39:12 +0000 (14:39 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 25 Aug 2008 12:39:12 +0000 (14:39 +0200)

Trivial merge