From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 16 Dec 2013 06:23:41 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into... 
X-Git-Tag: firefly_0821_release~6439
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=48a48cd79b77a4c639613edb0ee685b47d447e81;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into develop-3.10
---

48a48cd79b77a4c639613edb0ee685b47d447e81