Ingo Molnar 3d58f48ba0 Merge branch 'linus' into irq/numa ... Conflicts: arch/mips/sibyte/bcm1480/irq.c arch/mips/sibyte/sb1250/irq.c Merge reason: we gathered a few conflicts plus update to latest upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-06-01 21:06:21 +02:00
..
acpi	Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-04-28 17:21:20 -07:00
asm-generic	asm-generic: fix local_add_unless macro	2009-05-18 08:34:08 -07:00
crypto
drm	drm/i915: allocate large pointer arrays with vmalloc	2009-05-19 10:07:14 -07:00
keys
linux	Merge branch 'linus' into irq/numa	2009-06-01 21:06:21 +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
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-05 08:26:10 -07:00
pcmcia
rdma
rxrpc
scsi	[SCSI] fc-transport: Close state transition-window during rport deletion.	2009-05-15 12:16:46 -04:00
sound	ALSA: Release v1.0.20	2009-05-06 12:32:26 +02: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