Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

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

author	黄涛 <huangtao@rock-chips.com>
	Fri, 17 Aug 2012 13:48:20 +0000 (21:48 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Fri, 17 Aug 2012 13:48:20 +0000 (21:48 +0800)
commit	d7fb2169b62bff9d8d19aa6a7e9cf5c97c4ebd7f
tree	948c8bfbd123967173f5dcf9e9c0f560c50feb90	tree \| snapshot
parent	3be93856a121d7ff2af3d0315eb8b504532a64a7	commit \| diff
parent	67d9247a137f15fd66c3e5b310ebcfa94b69e3ea	commit \| diff

Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0

Conflicts:
arch/arm/mach-rk30/include/mach/rk30_camera.h
arch/arm/plat-rk/include/plat/rk_camera.h
drivers/gpio/gpio-tps65910.c
drivers/media/video/rk30_camera_oneframe.c
drivers/mmc/host/rk29_sdmmc.c
drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile
drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
drivers/regulator/rk30-pwm-regulator.c
drivers/usb/dwc_otg/dwc_otg_driver.c
drivers/usb/dwc_otg/dwc_otg_hcd.c
drivers/usb/dwc_otg/dwc_otg_pcd.c
sound/soc/codecs/Makefile
sound/soc/rk29/Kconfig

38 files changed:

arch/arm/configs/rk3066_sdk_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/rk30_ds1001b_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/rk30_phonepad_defconfig	diff1 \|	\|	blob \| history
arch/arm/configs/rk30_sdk_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/include/mach/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/include/mach/rk30_camera.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/io.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/pm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-rk/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-rk/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/adc/plat/rk30_adc.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-rk30.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-rk30.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/media/video/rk30_camera.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/rk29_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/rk30-pwm-regulator.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc_otg/dwc_otg_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc_otg/dwc_otg_pcd.c	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/rk29_backlight.c	diff1 \|	diff2 \|	blob \| history
drivers/video/logo/.gitignore	diff1 \|	diff2 \|	blob \| history
drivers/video/rockchip/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/rockchip/chips/rk30_lcdc.c	diff1 \|	diff2 \|	blob \| history
drivers/video/rockchip/hdmi/chips/rk30/rk30_hdmi_hw.c	\|	diff2 \|	blob \| history
drivers/video/rockchip/hdmi/rk_hdmi_edid.c	\|	diff2 \|	blob \| history
drivers/video/rockchip/rk_fb.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Makefile	diff1 \|	diff2 \|	blob \| history
sound/soc/rk29/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/soc/rk29/Makefile	diff1 \|	diff2 \|	blob \| history
sound/soc/rk29/rk30_i2s.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

arch/arm/configs/rk3066_sdk_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/rk30_ds1001b_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/rk30_phonepad_defconfig	diff1 \|	\|	blob \| history
arch/arm/configs/rk30_sdk_defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/include/mach/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/include/mach/rk30_camera.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/io.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk30/pm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-rk/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-rk/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/adc/plat/rk30_adc.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-rk30.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-rk30.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/media/video/rk30_camera.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/rk29_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/rk30-pwm-regulator.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc_otg/dwc_otg_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc_otg/dwc_otg_pcd.c	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/rk29_backlight.c	diff1 \|	diff2 \|	blob \| history
drivers/video/logo/.gitignore	diff1 \|	diff2 \|	blob \| history
drivers/video/rockchip/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/rockchip/chips/rk30_lcdc.c	diff1 \|	diff2 \|	blob \| history
drivers/video/rockchip/hdmi/chips/rk30/rk30_hdmi_hw.c	\|	diff2 \|	blob \| history
drivers/video/rockchip/hdmi/rk_hdmi_edid.c	\|	diff2 \|	blob \| history
drivers/video/rockchip/rk_fb.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Makefile	diff1 \|	diff2 \|	blob \| history
sound/soc/rk29/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/soc/rk29/Makefile	diff1 \|	diff2 \|	blob \| history
sound/soc/rk29/rk30_i2s.c	diff1 \|	diff2 \|	blob \| history