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

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

Conflicts solution:
keep 'KBUILD_CFLAGS += -fno-pic'
in arch/arm64/Makefile

25 files changed:

arch/arm/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/arm64/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	diff1 \|	diff2 \|	blob \| history
drivers/android/binder.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sdio.c	diff1 \|	diff2 \|	blob \| history
fs/fs-writeback.c	diff1 \|	diff2 \|	blob \| history
fs/super.c	diff1 \|	diff2 \|	blob \| history
include/linux/cgroup-defs.h	diff1 \|	diff2 \|	blob \| history
include/net/ip6_route.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ping.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/rfkill/core.c	diff1 \|	diff2 \|	blob \| history

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

arch/arm/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/arm64/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	diff1 \|	diff2 \|	blob \| history
drivers/android/binder.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sdio.c	diff1 \|	diff2 \|	blob \| history
fs/fs-writeback.c	diff1 \|	diff2 \|	blob \| history
fs/super.c	diff1 \|	diff2 \|	blob \| history
include/linux/cgroup-defs.h	diff1 \|	diff2 \|	blob \| history
include/net/ip6_route.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ping.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/rfkill/core.c	diff1 \|	diff2 \|	blob \| history