Jens Axboe 9bd7de51ee Merge branch 'master' into for-2.6.31 ... Conflicts: drivers/ide/ide-io.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>		2009-05-22 20:28:35 +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: Add new GET_PIPE_FROM_CRTC_ID ioctl.	2009-05-14 16:00:32 -07:00
keys
linux	Merge branch 'master' into for-2.6.31	2009-05-22 20:28:35 +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 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	Merge branch 'master' into for-2.6.31	2009-05-22 20:25:34 +02: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