Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit - drivers/media/video/rk_camsys/camsys

projects / firefly-linux-kernel-4.4.55.git / commit

author	Huang, Tao <huangtao@rock-chips.com>
	Tue, 10 Feb 2015 08:43:50 +0000 (16:43 +0800)
committer	Huang, Tao <huangtao@rock-chips.com>
	Tue, 10 Feb 2015 08:43:50 +0000 (16:43 +0800)
commit	220ae60186d32d4de8c259cc0550a2e417fb03ad
tree	5d411ba13a06860d8710340f21c0a6201ddddcf4	tree \| snapshot
parent	089c13477b5bed0c83ebb4e7092f254b70df080d	commit \| diff
parent	e57670a8e14e14601ff6b399efbff7063791f7e2	commit \| diff

Merge branch develop-3.10 into develop-3.10-next

Conflicts:
drivers/clk/rockchip/clk-ops.h
drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c
drivers/video/rockchip/rk_fb.c

23 files changed:

arch/arm/boot/dts/rk3288.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rockchip/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rockchip/vcodec_service.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/rk3368.dtsi	diff1 \|	\|	blob \| history
drivers/clk/rockchip/clk.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/rockchip-cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/input/sensors/sensor-dev.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/rockchip-iommu.c	diff1 \|	diff2 \|	blob \| history
drivers/media/v4l2-core/videobuf2-core.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/rk30_camera_oneframe.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/rk_camsys/camsys_internal.h	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/rk_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/power/rk30_factory_adc_battery.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc_otg_310/dwc_otg_hcd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/storage/unusual_devs.h	diff1 \|	diff2 \|	blob \| history
drivers/video/rockchip/rk_fb.c	diff1 \|	diff2 \|	blob \| history
include/linux/mmc/rk_mmc.h	diff1 \|	diff2 \|	blob \| history
include/linux/rk_fb.h	diff1 \|	diff2 \|	blob \| history
include/linux/rk_screen.h	diff1 \|	diff2 \|	blob \| history
net/rfkill/rfkill-bt.c	diff1 \|	diff2 \|	blob \| history
net/rfkill/rfkill-wlan.c	diff1 \|	diff2 \|	blob \| history
security/Kconfig	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

arch/arm/boot/dts/rk3288.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rockchip/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rockchip/vcodec_service.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/rk3368.dtsi	diff1 \|	\|	blob \| history
drivers/clk/rockchip/clk.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/rockchip-cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/input/sensors/sensor-dev.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/rockchip-iommu.c	diff1 \|	diff2 \|	blob \| history
drivers/media/v4l2-core/videobuf2-core.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/rk30_camera_oneframe.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/rk_camsys/camsys_internal.h	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/rk_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/power/rk30_factory_adc_battery.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc_otg_310/dwc_otg_hcd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/storage/unusual_devs.h	diff1 \|	diff2 \|	blob \| history
drivers/video/rockchip/rk_fb.c	diff1 \|	diff2 \|	blob \| history
include/linux/mmc/rk_mmc.h	diff1 \|	diff2 \|	blob \| history
include/linux/rk_fb.h	diff1 \|	diff2 \|	blob \| history
include/linux/rk_screen.h	diff1 \|	diff2 \|	blob \| history
net/rfkill/rfkill-bt.c	diff1 \|	diff2 \|	blob \| history
net/rfkill/rfkill-wlan.c	diff1 \|	diff2 \|	blob \| history
security/Kconfig	diff1 \|	diff2 \|	blob \| history