From: Huang, Tao <huangtao@rock-chips.com>
Date: Thu, 5 Mar 2015 02:21:27 +0000 (+0800)
Subject: Merge branch develop-3.10
X-Git-Tag: firefly_0821_release~4158^2~402
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6f1b688f7971145091170b96f6eb4990dad7d5c9;p=firefly-linux-kernel-4.4.55.git

Merge branch develop-3.10

Conflicts:
	drivers/staging/android/ion/rockchip/rockchip_ion.c
---

6f1b688f7971145091170b96f6eb4990dad7d5c9