diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-03-20 07:17:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-20 07:17:31 +1000 |
| commit | 55ae26b7953f0de851559b155800cd3b6f433164 (patch) | |
| tree | d7acf93729660f96b9dd9ebc37ae620cda90a715 /net/tipc/server.c | |
| parent | 27410e8248c64f5c6d28891389083b1022c15a10 (diff) | |
| parent | 0f4706d2740f2a221cd502922b22e522009041d9 (diff) | |
Merge tag 'drm-intel-fixes-2014-03-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes
two more fixes, both regressions.
* tag 'drm-intel-fixes-2014-03-19' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Disable stolen memory when DMAR is active
Revert "drm/i915: don't touch the VDD when disabling the panel"
Diffstat (limited to 'net/tipc/server.c')
0 files changed, 0 insertions, 0 deletions