Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into my_wifi
authorli bing <libing@rock-chips.com>
Sun, 28 Sep 2014 01:35:49 +0000 (09:35 +0800)
committerli bing <libing@rock-chips.com>
Sun, 28 Sep 2014 01:35:49 +0000 (09:35 +0800)

Trivial merge