From: Dave Airlie Date: Thu, 26 Aug 2010 23:09:46 +0000 (+1000) Subject: Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-fixes X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5afda9e9a4625d771795a5f540fb202eec08a49c;p=openwrt%2Fstaging%2Fblogic.git Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-fixes * 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next: drm/nouveau: drop drm_global_mutex before sleeping in submission path drm: export drm_global_mutex for drivers to use drm/nv20: Don't use pushbuf calls on the original nv20. drm/nouveau: Fix TMDS on some DCB1.5 boards. drm/nouveau: Fix backlight control on PPC machines with an internal TMDS panel. drm/nv30: Apply modesetting to the correct slave encoder drm/nouveau: Use a helper function to match PCI device/subsystem IDs. drm/nv50: add dcb type 14 to enum to prevent compiler complaint --- 5afda9e9a4625d771795a5f540fb202eec08a49c