next-20160111/aio

diff --cc fs/attr.c
Simple merge

diff --cc fs/internal.h
Simple merge

diff --cc fs/pipe.c
Simple merge

diff --cc fs/read_write.c
Simple merge

diff --cc fs/splice.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/auditsc.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc net/atm/common.c
Simple merge

diff --cc net/core/stream.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge