From: Simon Horman Date: Tue, 24 Dec 2013 12:08:27 +0000 (+0900) Subject: Merge branch 'sh-sci' into soc3-base X-Git-Tag: firefly_0821_release~176^2~4589^2~3^2~30 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e62db3848cd61e85a2b0b7828eb47de3ccda83e2;p=firefly-linux-kernel-4.4.55.git Merge branch 'sh-sci' into soc3-base --- e62db3848cd61e85a2b0b7828eb47de3ccda83e2