From: Zhang Rui <rui.zhang@intel.com>
Date: Fri, 3 Jan 2014 14:55:04 +0000 (+0800)
Subject: Merge branches 'misc' and 'soc' of .git into next
X-Git-Tag: firefly_0821_release~176^2~4582^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22;p=firefly-linux-kernel-4.4.55.git

Merge branches 'misc' and 'soc' of .git into next
---

8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22