Merge remote-tracking branch 'devicetree/devicetree/next'

diff --cc drivers/base/platform.c
Simple merge

diff --cc drivers/infiniband/hw/ehca/ehca_main.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ehea/ehea_main.c
Simple merge

diff --cc drivers/of/base.c
Simple merge