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
..
acpi	ACPI: delete obsolete "bus master activity" proc field	2009-04-22 19:56:09 -04:00
asm-generic	Add new HEAD_TEXT_SECTION macro.	2009-04-26 09:20:38 -07:00
crypto	crypto: zlib - New zlib crypto module, using pcomp	2009-03-04 15:16:19 +08:00
drm	Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-04-14 13:16:40 -07:00
keys	…
linux	Merge branch 'x86/apic' into irq/numa	2009-05-01 19:02:50 +02:00
math-emu	…
media	V4L/DVB (11381): ivtv/cx18: remove VIDIOC_INT_S_AUDIO_ROUTING debug support.	2009-04-06 21:44:28 -03:00
mtd	make MTD headers use strict integer types	2009-03-26 18:14:17 +01:00
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6	2009-04-16 16:32:29 -07:00
pcmcia	…
rdma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-03-26 15:54:36 -07:00
rxrpc	…
scsi	PM/Hibernate: Wait for SCSI devices scan to complete during resume	2009-04-13 11:37:07 -07:00
sound	Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6	2009-04-20 14:03:04 +01:00
trace	tracing/syscalls: use a dedicated file header	2009-04-09 05:43:32 +02:00
video	include/video/cyblafb.h: remove it, it's unused	2009-04-13 15:04:30 -07:00
xen	…
Kbuild	…