linux/arch
Ingo Molnar 4420471f14 Merge branch 'x86/apic' into irq/numa
Conflicts:
	arch/x86/kernel/apic/io_apic.c

Merge reason: non-trivial interaction between ongoing work in io_apic.c
              and the NUMA migration feature in the irq tree.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-05-01 19:02:50 +02:00
..
alpha irq: change ->set_affinity() to return status 2009-04-28 12:21:16 +02:00
arm irq: change ->set_affinity() to return status 2009-04-28 12:21:16 +02:00
avr32 clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
blackfin clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
cris irq: change ->set_affinity() to return status 2009-04-28 12:21:16 +02:00
frv FRV: Stop gcc from generating uninitialised variable warnings after BUG() 2009-04-27 08:04:49 -07:00
h8300 Get rid of final remnants of include/asm-$(ARCH) 2009-04-17 09:59:27 -07:00
ia64 irq: change ACPI GSI APIs to also take a device argument 2009-04-28 12:21:17 +02:00
m32r m32r: convert to use __HEAD and HEAD_TEXT macros. 2009-04-26 09:20:38 -07:00
m68k m68k: convert to use __HEAD and HEAD_TEXT macros. 2009-04-26 09:20:38 -07:00
m68knommu Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2009-04-24 08:45:53 -07:00
microblaze microblaze: add parameter to microblaze_read() 2009-04-23 16:27:38 +02:00
mips irq: change ->set_affinity() to return status 2009-04-28 12:21:16 +02:00
mn10300 mn10300: convert to use __HEAD and HEAD_TEXT macros. 2009-04-26 09:20:38 -07:00
parisc irq: change ->set_affinity() to return status 2009-04-28 12:21:16 +02:00
powerpc irq: change ->set_affinity() to return status 2009-04-28 12:21:16 +02:00
s390 s390: convert to use __HEAD and HEAD_TEXT macros. 2009-04-26 09:20:39 -07:00
sh sh: Fix up unsigned syscall_nr in SH-5 pt_regs. 2009-04-27 17:05:38 +09:00
sparc irq: change ->set_affinity() to return status 2009-04-28 12:21:16 +02:00
um uml: kill a kconfig warning 2009-04-21 13:41:50 -07:00
x86 Merge branch 'x86/apic' into irq/numa 2009-05-01 19:02:50 +02:00
xtensa xtensa: convert to use __HEAD and HEAD_TEXT macros. 2009-04-26 09:20:38 -07:00
.gitignore
Kconfig mutex: have non-spinning mutexes on s390 by default 2009-04-09 19:28:24 +02:00