Merge branch 'irq/sparseirq' into cpus4096

Browse source

Conflicts:
	arch/x86/kernel/io_apic.c

Merge irq/sparseirq here, to resolve conflicts.

...

This commit is contained in:

Ingo Molnar 2008-12-17 13:16:08 +01:00

parent 9466d6036f 17483a1f34

commit 948a7b2b5e

10 changed files with 317 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/pci/intr_remapping.c

View file