Merge branch 'linus' into x86/gart
authorIngo Molnar <mingo@elte.hu>
Fri, 15 Aug 2008 16:15:17 +0000 (18:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 15 Aug 2008 16:15:17 +0000 (18:15 +0200)

Trivial merge