Merge branch 'linus' into x86/quirks
authorIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:43:21 +0000 (12:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:43:21 +0000 (12:43 +0200)
Conflicts:
arch/x86/kernel/early-quirks.c


Trivial merge