Dave Airlie 36d1701c50 Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing ... * 'nouveau/for-airlied' of ../drm-nouveau-next: drm/nv50: cast IGP memory location to u64 before shifting drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack drm/nouveau: fix dual-link displays when plugged into single-link outputs drm/nv50: obey dcb->duallink_possible drm/nv50: fix duallink_possible calculation for DCB 4.0 cards drm/nouveau: don't execute INIT_GPIO unless we're really running the table drm/nv40: allow cold-booting of nv4x chipsets drm/nouveau: fix POST detection for certain chipsets drm/nouveau: Add getparam for current PTIMER time. drm/nouveau: allow cursor image and position to survive suspend		2010-06-01 11:32:29 +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 remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing	2010-06-01 11:32:29 +10:00
keys
linux	Merge remote branch 'anholt/drm-intel-next' into drm-next	2010-05-19 09:35:51 +10:00
math-emu	Fix misspellings of "truly" in comments.	2010-02-04 11:55:45 +01:00
media	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
mtd
net	net: fix compile error due to double return type in SOCK_DEBUG	2010-05-02 13:42:39 -07:00
pcmcia	pcmcia: pcmcia_dev_present bugfix	2010-04-21 08:09:17 +02: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