Merge branch develop-3.10 into develop-3.10-next

diff --cc drivers/clk/rockchip/clk-pll.c
Simple merge

diff --cc drivers/iommu/rockchip-iommu.c
Simple merge

diff --cc drivers/power/rk30_factory_adc_battery.c
Simple merge

diff --cc drivers/staging/android/ion/ion.c
Simple merge

diff --cc drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c
Simple merge