From: wdc <wdc@rock-chips.com>
Date: Sat, 12 Jul 2014 08:32:35 +0000 (+0800)
Subject: Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10... 
X-Git-Tag: firefly_0821_release~4916^2~247
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=32834fa632c7961bcac57b004ed5dacf51c7229f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10-next
---

32834fa632c7961bcac57b004ed5dacf51c7229f