Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
authorIngo Molnar <mingo@elte.hu>
Sun, 13 Jul 2008 20:52:27 +0000 (22:52 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 13 Jul 2008 20:52:27 +0000 (22:52 +0200)
Conflicts:

arch/x86/mm/ioremap.c

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

Trivial merge