| commit | e8115e79aa62b6ebdb3e8e61ca4092cc32938afc | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Dec 02 10:58:33 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Dec 02 10:58:33 2014 +1000 |
| tree | 42b791ab54ef9d5c73dcd49f907b8b37fa2f7e19 | |
| parent | 9be23ae4350bfd71c0cc2ea3494671ee90e5603b [diff] | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a [diff] |
Merge tag 'v3.18-rc7' into drm-next This fixes a bunch of conflicts prior to merging i915 tree. Linux 3.18-rc7 Conflicts: drivers/gpu/drm/exynos/exynos_drm_drv.c drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c drivers/gpu/drm/tegra/dc.c