Dave Airlie 3ff99164f6 Merge remote branch 'anholt/drm-intel-next' into drm-linus ... This merges the upstream Intel tree and fixes up numerous conflicts due to patches merged into Linus tree later in -rc cycle. Conflicts: drivers/char/agp/intel-agp.c drivers/gpu/drm/drm_dp_i2c_helper.c drivers/gpu/drm/i915/i915_irq.c drivers/gpu/drm/i915/i915_suspend.c		2009-12-08 14:03:47 +10:00
..
acpi	ACPI: remove acpi_device_uid() and related stuff	2009-09-25 15:09:49 -04:00
asm-generic	fcntl: rename F_OWNER_GID to F_OWNER_PGRP	2009-11-17 17:40:33 -08:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2009-09-11 09:38:37 -07:00
drm	Merge remote branch 'anholt/drm-intel-next' into drm-linus	2009-12-08 14:03:47 +10:00
keys	RxRPC: Use uX/sX rather than uintX_t/intX_t types	2009-09-16 00:01:13 -07:00
linux	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6	2009-12-02 15:41:49 -08:00
math-emu
media	V4L/DVB (13019): video: initial support for ADV7180	2009-09-19 00:53:39 -03:00
mtd
net	Merge branch 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2009-11-30 16:47:16 -08:00
pcmcia	PM / yenta: Split resume into early and late parts (rev. 4)	2009-11-03 10:54:58 +01:00
rdma	trivial: fix typo "to to" in multiple files	2009-09-21 15:14:55 +02:00
rxrpc
scsi	[SCSI] fix async scan add/remove race resulting in an oops	2009-11-26 09:43:39 -06:00
sound	Merge branch 'topic/ymfpci' into for-linus	2009-09-10 15:33:09 +02:00
trace	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2009-10-04 12:39:14 -07:00
video	davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx-v4	2009-09-23 07:39:51 -07:00
xen
Kbuild