Dave Airlie 7547a917fa Merge branch 'drm-ttm-unmappable' into drm-core-next ... * drm-ttm-unmappable: drm/radeon/kms: enable use of unmappable VRAM V2 drm/ttm: remove io_ field from TTM V6 drm/vmwgfx: add support for new TTM fault callback V5 drm/nouveau/kms: add support for new TTM fault callback V5 drm/radeon/kms: add support for new fault callback V7 drm/ttm: ttm_fault callback to allow driver to handle bo placement V6 drm/ttm: split no_wait argument in 2 GPU or reserve wait Conflicts: drivers/gpu/drm/nouveau/nouveau_bo.c		2010-04-20 14:15:09 +10:00
..
acpi	acpi: Support IBM SMBus CMI devices	2010-03-24 14:38:37 +01:00
asm-generic	dma-mapping: pci: move pci_set_dma_mask and pci_set_consistent_dma_mask to pci-dma-compat.h	2010-03-12 15:52:42 -08:00
crypto
drm	Merge branch 'drm-ttm-unmappable' into drm-core-next	2010-04-20 14:15:09 +10:00
keys
linux	Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-04-19 08:35:47 -07:00
math-emu
media	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
mtd
net	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2010-04-11 02:44:30 -07:00
pcmcia	pcmcia: use dev_pm_ops for class pcmcia_socket_class	2010-03-24 11:00:11 +01:00
rdma	Merge branch 'misc' into for-next	2010-03-01 23:52:31 -08:00
rxrpc
scsi	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sound	Merge branch 'fix/asoc' into for-linus	2010-04-07 09:54:41 +02:00
trace	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2010-04-09 11:50:29 -07:00
video	broadsheetfb: support storing waveform	2010-03-12 15:52:34 -08:00
xen	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kbuild