Ingo Molnar f066a15533 Merge branch 'x86/urgent' into x86/xen ... Conflicts: arch/frv/include/asm/pgtable.h arch/x86/include/asm/required-features.h arch/x86/xen/mmu.c Merge reason: x86/xen was on a .29 base still, move it to a fresher branch and pick up Xen fixes as well, plus resolve conflicts Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-05-08 10:50:00 +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	Merge branch 'x86/urgent' into x86/xen	2009-05-08 10:50:00 +02:00
crypto
drm	drm/i915: add support for G41 chipset	2009-04-21 17:22:53 -07:00
keys
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-05 08:26:10 -07: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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-05 08:26:10 -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	tdfxfb: move I2C functionality into the tdfxfb	2009-04-07 08:31:08 -07:00
xen	Merge branches 'for-linus/xen/dev-evtchn', 'for-linus/xen/xenbus', 'for-linus/xen/xenfs' and 'for-linus/xen/sys-hypervisor' into for-linus/xen/master	2009-03-30 10:00:45 -07:00
Kbuild	xen: export ioctl headers to userspace	2009-03-30 09:26:49 -07:00