diff options
| author | Neil Armstrong <narmstrong@baylibre.com> | 2017-01-30 11:31:06 +0100 |
|---|---|---|
| committer | Neil Armstrong <narmstrong@baylibre.com> | 2017-01-30 11:31:06 +0100 |
| commit | 150133b39efd9db34e91da2c1a69f0b2ef12bd73 (patch) | |
| tree | ab9d3ebbadb1f18790709080d38fdf4adac065f6 /drivers/gpu/drm/i915/i915_perf.c | |
| parent | 170e9274a3bc2822d636c0e044bfd80748f8b7ef (diff) | |
| parent | 385c0d3723834318fbe2087b8ba75ddf6db06e11 (diff) | |
| parent | 5c6fa0a0705f9e0e95f0891e7ca68c27d65f22cf (diff) | |
| parent | f7d7eee2429c194fe81fbf0a15d20c1f989f033b (diff) | |
Merge branches 'amlogic/v4.10/drm-hdmi-dw-hdmi', 'amlogic/v4.10/drm-hdmi-clk', 'amlogic/v4.10/drm-hdmi-pinctrl' and 'amlogic/v4.10/drm-hdmi-meson-drm' into amlogic/v4.10/drm-hdmi-mergeamlogic/v4.10/drm-hdmi-dev-20170130amlogic/v4.10/drm-hdmi-merge