| commit | 3e370b29d35fb01bfb92c2814d6f79bf6a2cb970 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jul 18 19:31:12 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jul 18 19:31:12 2008 +0200 |
| tree | 3b8fb467d60bfe6a34686f4abdc3a60050ba40a4 | |
| parent | 88d1dce3a74367291f65a757fbdcaf17f042f30c [diff] | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e [diff] |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks Conflicts: drivers/pci/quirks.c Signed-off-by: Ingo Molnar <mingo@elte.hu>