diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-01 19:58:33 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-01 19:58:33 -0500 |
| commit | e8115e79aa62b6ebdb3e8e61ca4092cc32938afc (patch) | |
| tree | 42b791ab54ef9d5c73dcd49f907b8b37fa2f7e19 /Documentation/dynamic-debug-howto.txt | |
| 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
Diffstat (limited to 'Documentation/dynamic-debug-howto.txt')
0 files changed, 0 insertions, 0 deletions