diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-20 20:39:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-20 20:39:28 -0700 |
| commit | 5556ea4df6426e2a11f459a633e26cb7466e0d1c (patch) | |
| tree | a8ecc76c7d4247beba150e630fc89ae7cae33c18 /net/wimax/stack.c | |
| parent | cfad81ce28b6d47fbc7c8afabd3ab16d9a8499e9 (diff) | |
| parent | e898c791e1a4c27fa1f221058b29b0ad06ddf8b0 (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull intel drm fixes from Dave Airlie:
"Intel fixes came in late, but since I debugged one of them I'll send
them on,
Two reverts, a quirk and one warn regression"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
Revert "drm/i915: reverse dp link param selection, prefer fast over wide again"
drm/i915: Track the primary plane correctly when reassigning planes
drm/i915: Ignore VBT backlight presence check on HP Chromebook 14
Revert "drm/i915: Don't set the 8to6 dither flag when not scaling"
Diffstat (limited to 'net/wimax/stack.c')
0 files changed, 0 insertions, 0 deletions