diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-21 19:41:28 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-21 19:41:28 (GMT) |
| commit | 36a21fe6399cafc440163890035ccd9b891de00f (patch) | |
| tree | 19099be4abce1eaea206c29bd3fe9254817e1934 /kernel/jump_label.c | |
| parent | 6551d6fe2128eaeb487c42ec4b1864b5f3245e60 (diff) | |
| parent | 017a27e7f52346ca8de6fc776579fbcc8ea55b48 (diff) | |
| download | linux-36a21fe6399cafc440163890035ccd9b891de00f.tar.xz | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Fixes for big 3 drivers:
nouveau: revert earlier MBP fix, put a dmi based MBP fix in its place
(fixes a regression we found on some Dell eDP panels doing some
internal testing)
radeon: revert pll fixes, real fix is too invasive, fix scratch leak
intel: 3 minor fixes, one for HDMI audio."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nouveau: add dmi quirk for gpio reset
drm/radeon: Prevent leak of scratch register on resume from suspend
Revert "drm/nv50-/gpio: initialise to vbios defaults during init"
Revert "drm/radeon: rework pll selection (v3)"
drm/i915: HDMI - Clear Audio Enable bit for Hot Plug
drm/i915: Reduce a pin-leak BUG into a WARN
drm/i915: enable lvds pin pairs before dpll on gen2
Diffstat (limited to 'kernel/jump_label.c')
0 files changed, 0 insertions, 0 deletions