From: wdc <wdc@rock-chips.com>
Date: Tue, 8 Jul 2014 01:17:57 +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~287
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=596905f64a1a752c19f57140a07b35fa866e0b57;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
---

596905f64a1a752c19f57140a07b35fa866e0b57