| commit | dbbcfb2211761fa69e831a78119c9288fb87eb9d | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sun Jul 13 22:52:27 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sun Jul 13 22:52:27 2008 +0200 |
| tree | b40b103ed250e287bf3d4790f1c87001cf7cf52f | |
| parent | b0356cd0e7497252a2c45ecb07b79d931390c8b2 [diff] | |
| parent | 9df2fe986770bc4c76e8fe72c20b71268eec39a7 [diff] |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks Conflicts: arch/x86/mm/ioremap.c Signed-off-by: Ingo Molnar <mingo@elte.hu>