]> 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>
Thu, 24 Oct 2013 13:03:00 +0000 (15:03 +0200)
commit23c641e7bcca3bf255d630cbadc50e9c17340baf
tree30b3ec8c8762e4eeffd69a7659363099c3063f03
parent099b7e8d2292f9bff2f5229b0760cdf5b32369b7
drm/i915: Resolve interaction with drm-fixes tree

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