Merge remote-tracking branch 'grant/devicetree/next' into for-next

diff --cc arch/microblaze/pci/pci-common.c
Simple merge

diff --cc arch/powerpc/sysdev/fsl_gtm.c
Simple merge

diff --cc arch/x86/kernel/devicetree.c
Simple merge

diff --cc drivers/crypto/caam/ctrl.c
Simple merge

diff --cc drivers/crypto/caam/jr.c
Simple merge

diff --cc drivers/input/serio/xilinx_ps2.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fs_enet/mac-fec.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fs_enet/mac-scc.c
Simple merge

diff --cc drivers/net/ethernet/xilinx/ll_temac_main.c
Simple merge

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

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

diff --cc drivers/of/of_pci_irq.c
index d86076431af668f34931cff162ebc698bc1f1b49,8e92acd8253f89b8505892a816b7fbc53d537285..8736bc7676c5d84b78cd42462fda90982ca079d9
--- 1/drivers/of/of_pci_irq.c
--- 2/drivers/of/of_pci_irq.c
+++ b/drivers/of/of_pci_irq.c
@@@ -2,9 -2,10 +2,9 @@@
  #include <linux/of_pci.h>
  #include <linux/of_irq.h>
  #include <linux/export.h>
 -#include <asm/prom.h>
  
  /**
-  * of_irq_map_pci - Resolve the interrupt for a PCI device
+  * of_irq_parse_pci - Resolve the interrupt for a PCI device
   * @pdev:       the device whose interrupt is to be resolved
   * @out_irq:    structure of_irq filled by this function
   *

diff --cc drivers/spi/spi-fsl-espi.c
Simple merge

diff --cc drivers/spi/spi-mpc512x-psc.c
Simple merge

diff --cc drivers/tty/serial/cpm_uart/cpm_uart_core.c
Simple merge

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