Merge branch develop-3.10 into develop-3.10-next
authorHuang, Tao <huangtao@rock-chips.com>
Thu, 20 Nov 2014 11:55:43 +0000 (19:55 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Thu, 20 Nov 2014 11:55:43 +0000 (19:55 +0800)
commit1f49c03ee0d79c6941697d40dae7ff1dddf95b79
treee154c3c60baae7fd8b53cfaa0f8f67a2400cef38
parentab8424a27929f03d25db602380bd1cdd39c623a9
parent161b114d426e0f8ee5ca330ce36f55bc75dfebb5
Merge branch develop-3.10 into develop-3.10-next
drivers/clk/rockchip/clk-pll.c
drivers/iommu/rockchip-iommu.c
drivers/media/video/rk_camsys/camsys_gpio.h
drivers/media/video/rk_camsys/camsys_internal.h
drivers/power/rk30_factory_adc_battery.c
drivers/staging/android/ion/ion.c
drivers/staging/android/trace/ion.h