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>
	Thu, 12 Jun 2014 13:04:26 +0000 (21:04 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Thu, 12 Jun 2014 13:04:26 +0000 (21:04 +0800)
commit	ee25a425b912bea6f9a14e566a7ab9b90ea95d08
tree	65bec0e5572a31559df998761c928daa10941225	tree \| snapshot
parent	79ef987e89915791fa5c2acc834639d2aa738b7a	commit \| diff
parent	45a68b78bbb2f16c7047e62b36a597a4d0ec8902	commit \| diff

Merge tag 'lsk-android-14.05' into develop-3.10

lsk 14.05 android release

Conflicts:
arch/arm/common/Kconfig
arch/arm64/include/asm/arch_timer.h
drivers/staging/android/fiq_debugger/fiq_debugger.c
drivers/usb/Kconfig

23 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch_timer.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/elf.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rockchip/Kconfig	diff1 \|	\|	blob \| history
arch/arm/mach-rockchip/rk_fiq_debugger.c	diff1 \|	\|	blob \| history
arch/arm64/include/asm/arch_timer.h	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/arm_arch_timer.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/fiq_debugger/fiq_debugger.c	\|	diff2 \|	blob \| history
drivers/staging/android/fiq_debugger/fiq_debugger.h	\|	diff2 \|	blob \| history
drivers/staging/android/ion/ion.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/rockchip/rockchip_ion.c	diff1 \|	\|	blob \| history
drivers/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/driver.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-hcd.c	diff1 \|	diff2 \|	blob \| history
include/clocksource/arm_arch_timer.h	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/dma-mapping.h	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch_timer.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/elf.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rockchip/Kconfig	diff1 \|	\|	blob \| history
arch/arm/mach-rockchip/rk_fiq_debugger.c	diff1 \|	\|	blob \| history
arch/arm64/include/asm/arch_timer.h	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/arm_arch_timer.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/fiq_debugger/fiq_debugger.c	\|	diff2 \|	blob \| history
drivers/staging/android/fiq_debugger/fiq_debugger.h	\|	diff2 \|	blob \| history
drivers/staging/android/ion/ion.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/rockchip/rockchip_ion.c	diff1 \|	\|	blob \| history
drivers/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/driver.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-hcd.c	diff1 \|	diff2 \|	blob \| history
include/clocksource/arm_arch_timer.h	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/dma-mapping.h	diff1 \|	diff2 \|	blob \| history