Merge branch 'linus' into x86/gart
authorIngo Molnar <mingo@elte.hu>
Thu, 12 Jun 2008 09:27:22 +0000 (11:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 12 Jun 2008 09:27:22 +0000 (11:27 +0200)

Trivial merge