From: Zhang Rui <rui.zhang@intel.com>
Date: Wed, 24 Apr 2013 13:43:00 +0000 (+0800)
Subject: Merge branch 'eduardo-1' of .git into next
X-Git-Tag: firefly_0821_release~3680^2~524^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=335553ce40f0e551383482ad6b0b0eba87f4f218;p=firefly-linux-kernel-4.4.55.git

Merge branch 'eduardo-1' of .git into next
---

335553ce40f0e551383482ad6b0b0eba87f4f218