diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-09-16 03:28:52 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-16 03:38:04 +0200 |
| commit | b2efb3f0a1db62aff5e824125785ec6731143b6d (patch) | |
| tree | 67510cec69e18e55d82bed803428b2a5027d92bb /drivers/ata/sata_dwc_460ex.c | |
| parent | Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-... (diff) | |
| parent | Linux 3.17-rc5 (diff) | |
| download | linux-b2efb3f0a1db62aff5e824125785ec6731143b6d.tar.xz linux-b2efb3f0a1db62aff5e824125785ec6731143b6d.zip | |
drm: backmerge tag 'v3.17-rc5' into drm-next
This is requested to get the fixes for intel and radeon into the
same tree for future development work.
i915_display.c: fix missing dev_priv conflict.
Diffstat (limited to 'drivers/ata/sata_dwc_460ex.c')
0 files changed, 0 insertions, 0 deletions