diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 20:56:41 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 20:56:41 +0400 |
commit | dfd07ec3fa42fb14c4e333747cb73903220c6e81 (patch) | |
tree | b203b9d7382e154051bdc0058efc1ba0e05575de /drivers/acpi/Makefile | |
parent | f94f72ee673edd6cd9cd36fd954173871808873f (diff) | |
parent | bf9c05d5b6d19b3e4c9fe21047694e94f48db89b (diff) | |
download | linux-dfd07ec3fa42fb14c4e333747cb73903220c6e81.tar.xz |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
vmwgfx: Fix assignment in vmw_framebuffer_create_handle
drm/radeon/kms: Fix device tree linkage of i2c buses
drm: Pass the real error code back during GEM bo initialisation
Revert "drm/i810: cleanup reclaim_buffers"
Diffstat (limited to 'drivers/acpi/Makefile')
0 files changed, 0 insertions, 0 deletions