From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 20 May 2010 09:51:59 +0000 (+0900)
Subject: ARM: Merge for-2635-4/ts-machines
X-Git-Tag: firefly_0821_release~9833^2~1878^2~1^2^2~28
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=fac3d3555568de1755025a9609daf492dd548a59;p=firefly-linux-kernel-4.4.55.git

ARM: Merge for-2635-4/ts-machines

Merge branch 'for-2635-4/ts-machines' into for-2635-4/partial1
---

fac3d3555568de1755025a9609daf492dd548a59