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>
	Mon, 26 Sep 2011 06:53:47 +0000 (14:53 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Mon, 26 Sep 2011 06:53:47 +0000 (14:53 +0800)
commit	d120da9fa2da5fe16dbab925a1dcf87a280c92d8
tree	44d2545404f10b98ebe8967833ec0eb67780d5bb	tree \| snapshot
parent	6b4dba395073cbfd72beb628e6deac1112529fc7	commit \| diff
parent	da7b50302d465c88e501bea686c5bcc41e71f484	commit \| diff

Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

Conflicts:
arch/arm/mm/mmu.c
drivers/input/keyboard/Makefile
drivers/media/video/gc0309.c
drivers/misc/Kconfig
drivers/mmc/core/core.c
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/usb/gadget/f_mass_storage.c
drivers/video/backlight/Makefile
include/linux/fb.h
include/linux/mmc/host.h

39 files changed:

arch/arm/mach-rk29/board-rk29-ddr3sdk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/board-rk29-phonesdk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/board-rk29phonepadsdk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/board-rk29sdk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/vpu_service.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
drivers/input/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/eeti_egalax_i2c.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/gc0309.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/ov2659.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/ov3640.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/ov5640.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/uvc/uvc_video.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/core.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/rk29_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/rk29_vmac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/power/wm831x_power.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/regulator/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/rk29_fb.c	diff1 \|	diff2 \|	blob \| history
include/linux/fb.h	diff1 \|	diff2 \|	blob \| history
include/linux/gfp.h	diff1 \|	diff2 \|	blob \| history
include/linux/mmc/host.h	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
sound/soc/rk29/rk29_i2s.c	diff1 \|	diff2 \|	blob \| history
sound/soc/rk29/rk29_pcm.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

arch/arm/mach-rk29/board-rk29-ddr3sdk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/board-rk29-phonesdk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/board-rk29phonepadsdk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/board-rk29sdk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/vpu_service.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
drivers/input/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/eeti_egalax_i2c.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/gc0309.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/ov2659.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/ov3640.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/ov5640.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/uvc/uvc_video.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/core.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/rk29_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/rk29_vmac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/power/wm831x_power.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/regulator/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/rk29_fb.c	diff1 \|	diff2 \|	blob \| history
include/linux/fb.h	diff1 \|	diff2 \|	blob \| history
include/linux/gfp.h	diff1 \|	diff2 \|	blob \| history
include/linux/mmc/host.h	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
sound/soc/rk29/rk29_i2s.c	diff1 \|	diff2 \|	blob \| history
sound/soc/rk29/rk29_pcm.c	diff1 \|	diff2 \|	blob \| history