James Bottomley 82681a318f [SCSI] Merge branch 'linus' ... Conflicts: drivers/message/fusion/mptsas.c fixed up conflict between req->data_len accessors and mptsas driver updates. Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>		2009-06-12 10:02:03 -05: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	Merge branch 'linus' into perfcounters/core	2009-06-11 17:55:42 +02:00
crypto
drm	drm: Hook up DPMS property handling in drm_crtc.c. Add drm_helper_connector_dpms.	2009-06-04 09:32:12 +10:00
keys
linux	[SCSI] Merge branch 'linus'	2009-06-12 10:02:03 -05: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	[SCSI] Merge branch 'linus'	2009-06-12 10:02:03 -05:00
sound	ALSA: Release v1.0.20	2009-05-06 12:32:26 +02:00
trace	Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block	2009-06-11 11:10:35 -07:00
video	include/video/cyblafb.h: remove it, it's unused	2009-04-13 15:04:30 -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