Merge branch develop-3.10-next

diff --cc arch/arm/boot/dts/rk3036.dtsi
Simple merge

diff --cc arch/arm/boot/dts/rk3288.dtsi
Simple merge

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

diff --cc drivers/media/video/rk_camsys/camsys_internal.h
Simple merge

diff --cc drivers/mmc/host/rk_sdmmc.c
Simple merge

diff --cc drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
index a0d4af49a498a830f7bc52feb1f294c5f335dd94,961648c5bd05b354a9d15250a99f863ea6b920f9..1809b14c4862b59a3b246b897b011e261469cf14
--- 1/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
--- 2/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
@@@ -718,25 -675,25 +718,25 @@@ dhd_conf_get_wme(dhd_pub_t *dhd, edcf_a
        memcpy((char*)acp, iovbuf, sizeof(edcf_acparam_t)*AC_COUNT);\r
  \r
        acparam = &acp[AC_BK];\r
-       CONFIG_TRACE(("%s: BK: aci %d aifsn %d ecwmin %d ecwmax %d size %d\n", __FUNCTION__,\r
+       CONFIG_TRACE(("%s: BK: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,\r
                acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,\r
                acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,\r
 -              sizeof(acp)));\r
 +              (int)sizeof(acp)));\r
        acparam = &acp[AC_BE];\r
-       CONFIG_TRACE(("%s: BE: aci %d aifsn %d ecwmin %d ecwmax %d size %d\n", __FUNCTION__,\r
+       CONFIG_TRACE(("%s: BE: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,\r
                acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,\r
                acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,\r
 -              sizeof(acp)));\r
 +              (int)sizeof(acp)));\r
        acparam = &acp[AC_VI];\r
-       CONFIG_TRACE(("%s: VI: aci %d aifsn %d ecwmin %d ecwmax %d size %d\n", __FUNCTION__,\r
+       CONFIG_TRACE(("%s: VI: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,\r
                acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,\r
                acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,\r
 -              sizeof(acp)));\r
 +              (int)sizeof(acp)));\r
        acparam = &acp[AC_VO];\r
-       CONFIG_TRACE(("%s: VO: aci %d aifsn %d ecwmin %d ecwmax %d size %d\n", __FUNCTION__,\r
+       CONFIG_TRACE(("%s: VO: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,\r
                acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,\r
                acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,\r
 -              sizeof(acp)));\r
 +              (int)sizeof(acp)));\r
  \r
        return;\r
  }\r
@@@ -769,10 -726,10 +769,10 @@@ dhd_conf_update_wme(dhd_pub_t *dhd, edc
        acp->ECW = ((ecwmax << EDCF_ECWMAX_SHIFT) & EDCF_ECWMAX_MASK) | (acp->ECW & EDCF_ECWMIN_MASK);\r
        acp->ECW = ((acp->ECW & EDCF_ECWMAX_MASK) | (ecwmin & EDCF_ECWMIN_MASK));\r
  \r
-       CONFIG_TRACE(("%s: mod aci %d aifsn %d ecwmin %d ecwmax %d size %d\n", __FUNCTION__,\r
+       CONFIG_TRACE(("%s: mod aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,\r
                acp->ACI, acp->ACI&EDCF_AIFSN_MASK,\r
                acp->ECW&EDCF_ECWMIN_MASK, (acp->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,\r
 -              sizeof(edcf_acparam_t)));\r
 +              (int)sizeof(edcf_acparam_t)));\r
  \r
        /*\r
        * Now use buf as an output buffer.\r

diff --cc drivers/pwm/pwm-rockchip.c
index a17d0472d11d784219fbcaad4e01950261e877a7,2b45870bb4c7702bac4f6db962b1c55758704aa0..33b28e9394938c9ff8df16e5f784ee32082ba40d
mode 100644,100755..100755
--- 1/drivers/pwm/pwm-rockchip.c
--- 2/drivers/pwm/pwm-rockchip.c
+++ b/drivers/pwm/pwm-rockchip.c