]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9670b93b912c00465d55d1d391d221a64670abb3
tree31f1f046875eb071e2aed031e5d9d1584742314f
parentfe7547435db0110cf4f212b66b2e4f555b41b11d
parent6e42ac2e0be8d41a79b271628b2ee664ddeb9534
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