diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-27 09:09:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-27 09:09:46 +1000 |
| commit | 5afda9e9a4625d771795a5f540fb202eec08a49c (patch) | |
| tree | cc31c845eed19c1f2428afd93ab761cec9977248 /drivers/power/power_supply.h | |
| parent | d03330383c9255cdb184dd33594e89c3542f191b (diff) | |
| parent | ab699ec64a4294f2f6ccd34b9bf8a2dcb4c4cb3c (diff) | |
| download | linux-5afda9e9a4625d771795a5f540fb202eec08a49c.tar.bz2 | |
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
Diffstat (limited to 'drivers/power/power_supply.h')
0 files changed, 0 insertions, 0 deletions