diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-05-20 11:30:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-20 11:30:02 +1000 |
| commit | 351fc4d660ff134fc33b920e1a3a97de4923dd91 (patch) | |
| tree | e148a145b28c2a39ff8df22509c249c35dd78747 /drivers/thermal/Makefile | |
| parent | fb0b760605d1f3bb7afc83ffd7a770f92bb62fca (diff) | |
| parent | 9e3c256d7d56a12a3242222945ce8e6347f93fa0 (diff) | |
Merge remote branch 'keithp/drm-intel-next' of ../drm-next into drm-core-next
* 'keithp/drm-intel-next' of ../drm-next:
drm/i915: initialize gen6 rps work queue on Sandy Bridge and Ivy Bridge
drm/i915/sdvo: Reorder i2c initialisation before ddc proxy
drm/i915: FDI link training broken on Ironlake by Ivybridge integration
drm/i915: enable rc6 by default
drm/i915: add fbc enable flag, but disable by default
drm/i915: clean up unused ring_get_irq/ring_put_irq functions
drm/i915: fix user irq miss in BSD ring on g4x
Diffstat (limited to 'drivers/thermal/Makefile')
0 files changed, 0 insertions, 0 deletions