From: Grant Likely <grant.likely@secretlab.ca>
Date: Wed, 8 Jun 2011 20:37:22 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin' into spi/merge
X-Git-Tag: firefly_0821_release~3680^2~5004^2~26^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b6336ca2982ccac98d9d017426c53ff1e13c017f;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'origin' into spi/merge
---

b6336ca2982ccac98d9d017426c53ff1e13c017f