Dave Airlie aa71fa3cd5 Merge remote branch 'nouveau/for-airlied' into drm-next-stage ... * nouveau/for-airlied: (25 commits) drm/nouveau: use ALIGN instead of open coding it drm/nouveau: report unknown connector state if lid closed drm/nouveau: support version 0x20 displayport tables drm/nouveau: Fix noaccel/nofbaccel option descriptions. drm/nv50: Implement ctxprog/state generation. drm/nouveau: use dcb connector types throughout the driver drm/nv50: enable hpd on any connector we know the gpio line for drm/nouveau: use dcb connector table for creating drm connectors drm/nouveau: construct a connector table for cards that lack a real one drm/nouveau: check for known dcb connector types drm/nouveau: parse dcb gpio/connector tables after encoders drm/nouveau: reorganise bios header, add dcb connector type enums drm/nouveau: merge nvbios and nouveau_bios_info drm/nouveau: merge parsed_dcb and bios_parsed_dcb into dcb_table drm/nouveau: rename parsed_dcb_gpio to dcb_gpio_table drm/nouveau: allow retrieval of vbios image from debugfs drm/nouveau: fix missing spin_unlock in failure path drm/nouveau: fix i2ctable bounds checking drm/nouveau: fix nouveau_i2c_find bounds checking drm/nouveau: fix pramdac_table range checking ... Conflicts: drivers/gpu/drm/nouveau/nouveau_gem.c		2010-03-01 15:41:15 +10:00
..
acpi	Merge branch 'bugzilla-14483' into release	2010-01-20 01:14:50 -05:00
asm-generic	fix up O_SYNC comments	2009-12-17 11:03:24 -05:00
crypto
drm	Merge remote branch 'nouveau/for-airlied' into drm-next-stage	2010-03-01 15:41:15 +10:00
keys
linux	Revert "block: improve queue_should_plug() by looking at IO depths"	2010-02-23 08:40:43 +01:00
math-emu
media	V4L/DVB (13670): soc-camera: Add mt9t112 camera driver	2009-12-16 09:27:41 -02:00
mtd
net	netfilter: nf_conntrack: fix hash resizing with namespaces	2010-02-08 11:18:07 -08:00
pcmcia
rdma	Merge branches 'amso1100', 'cma', 'cxgb3', 'ehca', 'ipath', 'ipoib', 'iser', 'misc', 'mlx4' and 'nes' into for-next	2009-12-15 23:39:25 -08:00
rxrpc
scsi	[SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.	2010-01-17 12:36:33 -06:00
sound
trace	tracing: Fix sign fields in ftrace_define_fields_##call()	2009-12-30 10:27:06 -05:00
video	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-12-16 10:29:52 -08:00
xen
Kbuild