From: Imre Deak <imre.deak@intel.com>
Date: Thu, 18 Jul 2013 14:44:13 +0000 (+0300)
Subject: drm/i915: restore debug message lost in merge resolution
X-Git-Tag: v3.12-rc1~136^2~129^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7984211ee8e1fa03cd4bc9ef3d347f94f8a2c8a8;p=pandora-kernel.git

drm/i915: restore debug message lost in merge resolution

Restore debug message lost in merge commit e1b73cba13. Also clarify it
that we are only clamping bpp not overwriting it.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

Reading git-diff-tree failed