Ingo Molnar 416dfdcdb8 Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing ... Conflicts: arch/x86/kernel/ptrace.c Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN dependency change from upstream so that we can remove it here. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-04-24 10:11:23 +02:00
..
acpi	Merge branches 'release', 'APERF', 'ARAT', 'misc', 'kelvin', 'device-lock' and 'bjorn.notify' into release	2009-04-07 18:18:42 -04:00
asm-generic	PERCPU: Collect the DECLARE/DEFINE declarations together	2009-04-21 19:40:00 -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 commit 'v2.6.30-rc3' into tracing/hw-branch-tracing	2009-04-24 10:11:23 +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	ipv6: Fix NULL pointer dereference with time-wait sockets	2009-04-11 01:53:06 -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 'topic/hda' into for-linus	2009-04-15 11:24:09 +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	xen: add xenfs to allow usermode <-> Xen interaction	2009-01-08 08:30:59 -08:00
Kbuild	…