Merge remote-tracking branch 'pm/linux-next'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/acpi/apei/ghes.c
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc fs/cifs/transport.c
Simple merge

diff --cc fs/nfs/inode.c
Simple merge

diff --cc fs/nfs/nfs3proc.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge

diff --cc net/sunrpc/sched.c
Simple merge