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, 16 Dec 2010 12:54:24 +0000 (20:54 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Thu, 16 Dec 2010 12:54:24 +0000 (20:54 +0800)
commit	6e2688ca848b14639c6ce07ec87c51fdc1742b61
tree	1aba6badb8fef94e9ab227aae957f14602835d15	tree \| snapshot
parent	4b7c9de4deb80eb1e1b154112a5e6cb2d3d79f96	commit \| diff
parent	a386bf75dea7208041b5d4b8d44726876e28ee4b	commit \| diff

Merge remote branch 'linux-2.6.32.y/master' into develop

Conflicts:
drivers/i2c/busses/Kconfig
drivers/net/dm9000.c
drivers/net/wireless/libertas/if_sdio1.c
drivers/usb/serial/option.c
net/bluetooth/rfcomm/core.c

40 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/head.S	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/base/firmware_class.c	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/hci_ldisc.c	diff1 \|	diff2 \|	blob \| history
drivers/char/mem.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/i2c-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dm9000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ar9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_sdio1.c	diff1 \|	\|	blob \| history
drivers/rtc/class.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
fs/fs-writeback.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/proc/task_mmu.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
init/initramfs.c	diff1 \|	diff2 \|	blob \| history
kernel/cgroup_freezer.c	diff1 \|	diff2 \|	blob \| history
kernel/cpuset.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/futex.c	diff1 \|	diff2 \|	blob \| history
kernel/power/process.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_native.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/head.S	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/base/firmware_class.c	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/hci_ldisc.c	diff1 \|	diff2 \|	blob \| history
drivers/char/mem.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/i2c-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dm9000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ar9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_sdio1.c	diff1 \|	\|	blob \| history
drivers/rtc/class.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
fs/fs-writeback.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/proc/task_mmu.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
init/initramfs.c	diff1 \|	diff2 \|	blob \| history
kernel/cgroup_freezer.c	diff1 \|	diff2 \|	blob \| history
kernel/cpuset.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/futex.c	diff1 \|	diff2 \|	blob \| history
kernel/power/process.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_native.c	diff1 \|	diff2 \|	blob \| history