diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-11-02 10:26:03 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-02 10:26:39 +1000 |
| commit | 9c275407a354bf8c61e895f5c233397506d705aa (patch) | |
| tree | c3d35000f04d95824f5a61d29ec39266b97e6a77 /fs/dlm/lock.h | |
| parent | 4936b172d699434547addbe452c2d600ea6a4baf (diff) | |
| parent | 1623392af9da983f3ad088a75076c9da05e5600d (diff) | |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Daniel Vetter writes"
Nothing big at all for -fixes, just small stuff:
- Two patches to fix bugs on i830M
- ums regression fixer due to kicking firmeware fbs (Chris)
- tune down a too loud warning (Jani)
- be more careful with sdvo infoframes, which fixes a long-standing
sdvo-hdmi regression"
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: Only kick out vesafb if we takeover the fbcon with KMS
drm/i915: be less verbose about inability to provide vendor backlight
drm/i915: clear the entire sdvo infoframe buffer
drm/i915: VGA needs to be on pipe A on i830M
drm/i915: fix overlay on i830M
Diffstat (limited to 'fs/dlm/lock.h')
0 files changed, 0 insertions, 0 deletions