diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-02-18 16:21:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-02-18 16:21:49 +1000 |
| commit | 42738c2b39fef8cae3e7138948d9e0979b703894 (patch) | |
| tree | 2e40af81118559049c2bc60a95215508d515e851 /drivers/hid/hid-ids.h | |
| parent | 3f0606cbd935067928a6e1d555a0e72c8a572b74 (diff) | |
| parent | f51a44b9a6c4982cc25bfb3727de9bb893621ebc (diff) | |
Merge tag 'drm-intel-fixes-2014-02-14' of ssh://git.freedesktop.org/git/drm-intel into drm-fixes
3 fixes plus 1 prep patch, all four cc: stable. Jani will take over from
here and the plan is that he'll do 3.14-fixes for the entire release just
to work things out a bit.
* tag 'drm-intel-fixes-2014-02-14' of ssh://git.freedesktop.org/git/drm-intel:
drm/i915/dp: add native aux defer retry limit
drm/i915/dp: increase native aux defer retry timeout
drm/i915: Prevent MI_DISPLAY_FLIP straddling two cachelines on IVB
drm/i915: Add intel_ring_cachline_align()
Diffstat (limited to 'drivers/hid/hid-ids.h')
0 files changed, 0 insertions, 0 deletions