Merge branch 'hfi1-2' into k.o/for-4.7

MAINTAINERS

drivers/infiniband/Kconfig

drivers/infiniband/hw/Makefile

drivers/infiniband/hw/hfi1/Kconfig

drivers/infiniband/hw/hfi1/Makefile

drivers/infiniband/hw/hfi1/affinity.c

drivers/infiniband/hw/hfi1/affinity.h

drivers/infiniband/hw/hfi1/aspm.h

drivers/infiniband/hw/hfi1/chip.c

drivers/infiniband/hw/hfi1/chip.h

drivers/infiniband/hw/hfi1/chip_registers.h

drivers/infiniband/hw/hfi1/common.h

drivers/infiniband/hw/hfi1/debugfs.c

drivers/infiniband/hw/hfi1/debugfs.h

drivers/infiniband/hw/hfi1/device.c

drivers/infiniband/hw/hfi1/device.h

drivers/infiniband/hw/hfi1/dma.c

drivers/infiniband/hw/hfi1/driver.c

drivers/infiniband/hw/hfi1/efivar.c

drivers/infiniband/hw/hfi1/efivar.h