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

author 黄涛 <huangtao@rock-chips.com>

Mon, 4 Aug 2014 08:52:07 +0000 (16:52 +0800)

committer 黄涛 <huangtao@rock-chips.com>

Mon, 4 Aug 2014 08:52:07 +0000 (16:52 +0800)
author 黄涛 <huangtao@rock-chips.com>
Mon, 4 Aug 2014 08:52:07 +0000 (16:52 +0800)
committer 黄涛 <huangtao@rock-chips.com>
Mon, 4 Aug 2014 08:52:07 +0000 (16:52 +0800)
diff --cc arch/arm/mach-rockchip/Makefile
Simple merge
diff --cc include/linux/rockchip/sysmmu.h
Simple merge
author	黄涛 <huangtao@rock-chips.com>
	Mon, 4 Aug 2014 08:52:07 +0000 (16:52 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Mon, 4 Aug 2014 08:52:07 +0000 (16:52 +0800)
		1	2
arch/arm/mach-rockchip/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/rockchip/sysmmu.h	patch \|	diff1 \|	diff2 \|	blob \| history