Merge branch 'linus' into x86/x2apic
authorIngo Molnar <mingo@elte.hu>
Fri, 25 Jul 2008 11:08:16 +0000 (13:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 25 Jul 2008 11:08:16 +0000 (13:08 +0200)
Conflicts:

drivers/pci/dmar.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge