From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 6 Jan 2014 14:48:19 +0000 (+0800)
Subject: Merge branch 'misc' of .git into next
X-Git-Tag: firefly_0821_release~176^2~4582^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c698a4492f01127ca90fc28cd5157f3d616fe4ff;p=firefly-linux-kernel-4.4.55.git

Merge branch 'misc' of .git into next
---

c698a4492f01127ca90fc28cd5157f3d616fe4ff