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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 08562bf 2bf7955)

author	Alex Shi <alex.shi@linaro.org>
	Thu, 21 Apr 2016 06:08:44 +0000 (14:08 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Thu, 21 Apr 2016 06:08:44 +0000 (14:08 +0800)
commit	bab15641824ad77e5f3af9cc4b84308cba32aa7d
tree	6a7333fc6f30e08a7142daa5dbc1dd2bf5d08dca	tree \| snapshot
parent	08562bfcb85748c69e5824fc6d1d77d5725787e4	commit \| diff
parent	2bf7955152a0544342fcaed28930748cc68392ae	commit \| diff

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
d_canonical_path in include/linux/dcache.h

drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
fs/dcache.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	diff1 \|	diff2 \|	blob \| history
include/linux/dcache.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_frontend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/exthdrs_core.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history

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