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)
commitacbaa41a780490c791492c41144c774c04875af1
tree31f1f046875eb071e2aed031e5d9d1584742314f
parent8d89adf44cf750e49691ba5b744b2ad77a05e997
parentfd048088306656824958e7783ffcee27e241b361
Merge branch 'linus' into x86/quirks

Conflicts:
arch/x86/kernel/early-quirks.c
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/early-quirks.c