Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into...
author黄涛 <huangtao@rock-chips.com>
Tue, 10 Dec 2013 04:10:55 +0000 (12:10 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 10 Dec 2013 04:10:55 +0000 (12:10 +0800)

Trivial merge