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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 7362dbf 184c20b)

author	黄涛 <huangtao@rock-chips.com>
	Tue, 10 Dec 2013 04:23:21 +0000 (12:23 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Tue, 10 Dec 2013 04:23:21 +0000 (12:23 +0800)
commit	aea1f7c03c2a14f4c1a3f75e5c1bf8752ec66f13
tree	32ee713f9e4215b5e355fade4a2c69959a965ff7	tree \| snapshot
parent	7362dbfb8caa159f4cbecfbbd11897ed5500294d	commit \| diff
parent	184c20bbc978eb7a2e1d3637b7864208822c7ebc	commit \| diff

Merge tag 'v3.10.23' into develop-3.10

This is the 3.10.23 stable release

Conflicts:
drivers/input/evdev.c

17 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
block/blk-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-multitouch.c	diff1 \|	diff2 \|	blob \| history
drivers/input/evdev.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	diff1 \|	diff2 \|	blob \| history
kernel/time/alarmtimer.c	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	diff1 \|	diff2 \|	blob \| history
mm/mprotect.c	diff1 \|	diff2 \|	blob \| history
mm/vmstat.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/af_bluetooth.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history

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