diff options
| author |   Dave Airlie <airlied@redhat.com> | 2010-03-01 16:22:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-01 16:22:38 +1000 |
| commit | 1c62233508ef7104f8a78e571fdf5c72d0dc0200 (patch) | |
| tree | 31e19cbff5c1080d3015d20b24dd43ee95f4ed8c /drivers/acpi/debug.c | |
| parent | drm/radeon/kms: do not disable audio engine twice (diff) | |
| parent | vga_switcheroo: initial implementation (v15) (diff) | |
| download | linux-dev-1c62233508ef7104f8a78e571fdf5c72d0dc0200.tar.xz linux-dev-1c62233508ef7104f8a78e571fdf5c72d0dc0200.zip | |
Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage
* 'gpu-switcher' of /ssd/git//linux-2.6:
vga_switcheroo: initial implementation (v15)
fb: for framebuffer handover don't exit the loop early.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/radeon/Makefile
drivers/gpu/drm/radeon/radeon.h
Diffstat (limited to 'drivers/acpi/debug.c')
0 files changed, 0 insertions, 0 deletions