From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 18 Oct 2013 15:00:02 +0000 (+0100)
Subject: Merge branches 'drm-3.12' and 'tda998x-3.12' into drm-tda998x-3.12
X-Git-Tag: firefly_0821_release~176^2~4758^2~6^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dfdba7fd60592818078e9ceec04ffa49347e1aed;p=firefly-linux-kernel-4.4.55.git

Merge branches 'drm-3.12' and 'tda998x-3.12' into drm-tda998x-3.12
---

dfdba7fd60592818078e9ceec04ffa49347e1aed