camera:

	camsys_drv: v0.0x1c.0
    oneframe: v0.2.0
    pingpong: v0.1.a

Conflicts:
	drivers/media/video/rk_camsys/camsys_gpio.h
	drivers/media/video/rk_camsys/camsys_internal.h
	drivers/media/video/rk_camsys/camsys_soc_priv.c
	include/linux/rockchip/cru.h

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

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

diff --cc drivers/media/video/rk30_camera_oneframe.c
index 71e5ea01f13268d8b61a2e48bf7f4f75e150fbe0,e6c499abb34b776fbf4e2a74106459a26b53695c..b20d8b757cef9e292d0918ed3eebedfa472e0fd3
--- 1/drivers/media/video/rk30_camera_oneframe.c
--- 2/drivers/media/video/rk30_camera_oneframe.c
+++ b/drivers/media/video/rk30_camera_oneframe.c
@@@ -544,9 -508,11 +508,11 @@@ static inline void rk_cru_set_soft_rese
                val = on ? 0x10001U << 14 : 0x10000U << 14;
        }else if(CHIP_NAME == 3288){
                val = on ? 0x10001U << 8 : 0x10000U << 8;
+       }else if(CHIP_NAME == 3368){
+               val = on ? 0x10001U << 8 : 0x10000U << 8;
        }
        writel_relaxed(val, reg);
 -      dsb();
 +      dsb(sy);
  }
  
  static void rk_camera_cif_reset(struct rk_camera_dev *pcdev, int only_rst)

diff --cc drivers/media/video/rk_camsys/camsys_gpio.h
index 1c6d2e2a8f2d36da488225e765b21ccf866cfa9c,d3c74994cf5d815294dd77d0a026f85faa50fd07..f180b9773d0b2b0033edc388ab30898dd288ac48
--- 1/drivers/media/video/rk_camsys/camsys_gpio.h
--- 2/drivers/media/video/rk_camsys/camsys_gpio.h
+++ b/drivers/media/video/rk_camsys/camsys_gpio.h
@@@ -1,7 -1,9 +1,7 @@@
  #ifndef __RKCAMSYS_GPIO_H__
  #define __RKCAMSYS_GPIO_H__
  
- #include <linux/gpio.h>
 -
+ //#include <asm/gpio.h>
 -
  #if defined(CONFIG_ARCH_ROCKCHIP)
  #define RK30_PIN0_PA0 (0)
  #define NUM_GROUP     (32)

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

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

diff --cc include/linux/rockchip/cru.h
Simple merge