From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 4 Aug 2014 08:52:07 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
X-Git-Tag: firefly_0821_release~4916^2~69
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4b19ba34771e5f82ba6cf16bc7cc6b0b480369de;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
	drivers/staging/android/ion/ion.c
	include/linux/rockchip/sysmmu.h
---

4b19ba34771e5f82ba6cf16bc7cc6b0b480369de