From: Grant Likely <grant.likely@secretlab.ca>
Date: Sun, 13 Feb 2011 06:53:34 +0000 (-0700)
Subject: Merge branch 'devicetree/merge' into spi/merge
X-Git-Tag: firefly_0821_release~7613^2~2422^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c170093d31bd4e3bc51881cc0f123beeca7872c9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'devicetree/merge' into spi/merge
---

c170093d31bd4e3bc51881cc0f123beeca7872c9