Dave Airlie 38f1cff086 Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next ... This commit changed an internal radeon structure, that meant a new driver in -next had to be fixed up, merge in the commit and fix up the driver. Also fixes a trivial nouveau merge. Conflicts: drivers/gpu/drm/nouveau/nouveau_mem.c		2011-03-16 11:34:41 +10:00
..
acpi	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2011-01-20 16:28:34 -08:00
asm-generic	mm: <asm-generic/pgtable.h> must include <linux/mm_types.h>	2011-02-28 17:46:49 -08:00
crypto	crypto: padlock - Move padlock.h into include/crypto	2011-01-07 14:52:00 +11:00
drm	Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next	2011-03-14 14:15:13 +10:00
keys	RxRPC: Fix v1 keys	2011-03-02 22:18:53 -08:00
linux	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2011-03-09 16:45:02 -08:00
math-emu
media	[media] v4l: Include linux/videodev2.h in media/v4l2-ctrls.h	2011-01-19 11:52:09 -02:00
mtd
net	net_sched: long word align struct qdisc_skb_cb data	2011-02-23 14:17:02 -08:00
pcmcia	pcmcia: re-enable Zoomed Video support	2011-02-20 12:47:34 +01:00
rdma	RDMA: Update workqueue usage	2011-01-16 21:16:31 -08:00
rxrpc
scsi	[SCSI] fix incorrect value of SCSI_MAX_SG_CHAIN_SEGMENTS due to include file ordering	2011-01-24 11:49:34 -06:00
sound	ASoC: WM8903: Fix mic detection register definitions	2011-02-13 19:38:06 +00:00
target	[SCSI] target: fix use after free detected by SLUB poison	2011-02-12 12:32:41 -06:00
trace	blktrace: Remove blk_fill_rwbs_rq.	2011-03-03 10:53:20 -05:00
video	Merge branch 'fbdev/udlfb'	2011-01-06 18:10:09 +09:00
xen	Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-13 18:46:48 -08:00
Kbuild