]> 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)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 13:24:14 +0000 (14:24 +0100)
commit5ecdcfda8bda6ba5b574a0d4beb7e5ca9dcb3ee1
tree115ee3fc7864a1e238d08d30fcc366d07730afd8
parent1eac9abf75cace2b55ad33b4b0adce69d5cafdb3
drm/i915: Resolve interaction with drm-fixes tree

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