| commit | 10a010f6953b5a14ba2f0be40a4fce1bea220875 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jul 25 13:08:16 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jul 25 13:08:16 2008 +0200 |
| tree | 19aadf718c796bc7fae0a1a1c970d84d67c541d4 | |
| parent | 510b37258dfd61693ca6c039865c78bd996e3718 [diff] | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 [diff] |
Merge branch 'linus' into x86/x2apic Conflicts: drivers/pci/dmar.c Signed-off-by: Ingo Molnar <mingo@elte.hu>