diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-10 16:43:46 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-10 16:43:46 -0400 |
| commit | e8e6e6012d68c4967e8f26fdd39ac95c247d4789 (patch) | |
| tree | 6b88dfc219ad811a564e81e9c2219dd5cd1b0fa4 /tools/perf/scripts/python/syscall-counts.py | |
| parent | bc079e8b1684e1de505ec06f8c2339ae60a329e8 (diff) | |
| parent | fa389e220254c69ffae0d403eac4146171062d08 (diff) | |
Merge tag 'v3.14-rc6' into drm-intel-next-queued
Linux 3.14-rc6
I need the hdmi/dvi-dual link fixes in 3.14 to avoid ugly conflicts
when merging Ville's new hdmi cloning support into my -next tree
Conflicts:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/intel_dp.c
Makefile cleanup conflicts with an acpi build fix, intel_dp.c is
trivial.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions