tree 19aadf718c796bc7fae0a1a1c970d84d67c541d4
parent 510b37258dfd61693ca6c039865c78bd996e3718
parent fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43
author Ingo Molnar <mingo@elte.hu> 1216984096 +0200
committer Ingo Molnar <mingo@elte.hu> 1216984096 +0200

Merge branch 'linus' into x86/x2apic

Conflicts:

	drivers/pci/dmar.c

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