Merge branch develop-3.10 into develop-3.10-next
authorHuang, Tao <huangtao@rock-chips.com>
Wed, 3 Dec 2014 11:10:23 +0000 (19:10 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 3 Dec 2014 11:10:23 +0000 (19:10 +0800)
commitf0f3909f35e3d839f26b6fbcc54259c14dc71c3b
tree37408baf36a368e0063cc1f9d179a4c55ed205cd
parent1f49c03ee0d79c6941697d40dae7ff1dddf95b79
parentb8cffb14fc337b4f4445838f15d3b4730e0457cd
Merge branch develop-3.10 into develop-3.10-next
drivers/clk/rockchip/clk-pll.c
drivers/iommu/rockchip-iommu.c
drivers/power/rk30_factory_adc_battery.c
drivers/staging/android/ion/ion.c
drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c