Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 11 Oct 2016 21:33:37 +0000 (23:33 +0200)
committerAlex Shi <alex.shi@linaro.org>
Tue, 11 Oct 2016 21:33:37 +0000 (23:33 +0200)
commit16d185eee470cf2dc3e909a59132893abfdd4b11
treee48bdb15a5e30feb76a3eed812054b836166b2b5
parent0a9cbce798bca52bb3476cb55ce33da27e100f3e
parentbe2a76aecfc5ed58ddf8925190cc1cfb519bf932
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
kernel/cpuset.c
15 files changed:
arch/x86/include/asm/uaccess.h
drivers/md/dm-crypt.c
fs/ext4/ioctl.c
fs/ext4/mballoc.c
fs/proc/base.c
include/linux/mm.h
kernel/cpuset.c
kernel/fork.c
kernel/sched/core.c
kernel/trace/Makefile
kernel/trace/trace.c
net/ipv4/tcp_ipv4.c
net/ipv6/addrconf.c
net/ipv6/ping.c
net/ipv6/tcp_ipv6.c