Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / irq_64.c

diff --git a/arch/x86_64/kernel/irq.c b/arch/x86/kernel/irq_64.c
similarity index 100%
rename from arch/x86_64/kernel/irq.c
rename to arch/x86/kernel/irq_64.c