From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 11 Jul 2014 14:39:05 +0000 (+0100)
Subject: Merge branches 'drm-devel' and 'component-for-driver' into armada-drm
X-Git-Tag: v3.17-rc1~82^2~32^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f2d27026c4728533d60ac0b7b98df18f6b2cd0c;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'drm-devel' and 'component-for-driver' into armada-drm
---

2f2d27026c4728533d60ac0b7b98df18f6b2cd0c