Merge branch linux-linaro-lsk-v3.10-android
authorHuang, Tao <huangtao@rock-chips.com>
Mon, 16 Mar 2015 12:30:06 +0000 (20:30 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Mon, 16 Mar 2015 12:30:06 +0000 (20:30 +0800)

Trivial merge