diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-08 07:03:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-08 07:03:55 +1000 |
| commit | f84676185368e36c6bc0eeab87ab73ed39042648 (patch) | |
| tree | 7d97885644c7b6a09c244de11af94409da665e62 /drivers/macintosh/therm_pm72.h | |
| parent | 22dd50133ab7548adb23e86c302d6e8b75817e8c (diff) | |
| parent | 447aeb907e417e0e837b4a4026d5081c88b6e8ca (diff) | |
Merge remote branch 'origin/drm-core-next' into test
Conflicts:
drivers/gpu/drm/drm_fb_helper.c
Diffstat (limited to 'drivers/macintosh/therm_pm72.h')
0 files changed, 0 insertions, 0 deletions