Merge remote-tracking branch 'origin/develop-3.10-next' into develop-3.10
author黄涛 <huangtao@rock-chips.com>
Tue, 12 Aug 2014 09:39:16 +0000 (17:39 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 12 Aug 2014 09:39:16 +0000 (17:39 +0800)
commit68fe6924d38d1df6042a59acb04d6bfc8669e0d8
tree8e852ff0844a53401ccf5c4c28c6967e3bb960eb
parentc93122b5677e1332a7fe154f1b1bd92e5437e822
parent4a15e1e1cd6c2b4a809fbebd74151ccd48b2998c
Merge remote-tracking branch 'origin/develop-3.10-next' into develop-3.10

Conflicts:
arch/arm/mach-rockchip/vcodec_service.c
drivers/iommu/rockchip-iommu.c
drivers/iommu/rockchip-iovmm.c
drivers/net/ethernet/rockchip/gmac/stmmac_platform.c
include/linux/rockchip/sysmmu.h
arch/arm/boot/dts/rk3288.dtsi
drivers/iommu/rockchip-iommu.c
drivers/iommu/rockchip-iovmm.c
drivers/mmc/host/dw_mmc-rockchip.c
drivers/net/ethernet/rockchip/gmac/stmmac_platform.c
drivers/video/rockchip/lcdc/rk312x_lcdc.c
drivers/video/rockchip/rk_fb.c