]> git.karo-electronics.de Git - karo-tx-linux.git/commit
drm/i915: Resolve interaction with drm-fixes tree
authorMark Brown <broonie@linaro.org>
Thu, 3 Oct 2013 17:10:55 +0000 (18:10 +0100)
committerThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:57:20 +0000 (13:57 +0200)
commitfdbfafb1be4d03fd2e936b3323b0f197a5076cc2
treeb4d648ae8336ef7c88963787a266d32a0a9ccd89
parentb235a11ad507e4db2ad7b86d7b50dd4b5d6a85ef
drm/i915: Resolve interaction with drm-fixes tree

Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/gpu/drm/i915/intel_pm.c