From: Zheng Yang <zhengyang@rock-chips.com>
Date: Sat, 12 Jul 2014 03:30:09 +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~263
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=454f5787348942cc34607bfd324265651ff7c653;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
---

454f5787348942cc34607bfd324265651ff7c653