Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android+android...
author黄涛 <huangtao@rock-chips.com>
Mon, 11 Nov 2013 06:38:40 +0000 (14:38 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 11 Nov 2013 06:38:40 +0000 (14:38 +0800)

Trivial merge