Merge remote-tracking branch 'grant/devicetree/next' into for-next
authorRob Herring <rob.herring@calxeda.com>
Thu, 7 Nov 2013 16:34:46 +0000 (10:34 -0600)
committerRob Herring <rob.herring@calxeda.com>
Thu, 7 Nov 2013 16:34:46 +0000 (10:34 -0600)
17 files changed:
1  2 
arch/microblaze/pci/pci-common.c
arch/powerpc/sysdev/fsl_gtm.c
arch/x86/kernel/devicetree.c
drivers/crypto/caam/ctrl.c
drivers/crypto/caam/jr.c
drivers/input/serio/xilinx_ps2.c
drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
drivers/net/ethernet/freescale/fs_enet/mac-fec.c
drivers/net/ethernet/freescale/fs_enet/mac-scc.c
drivers/net/ethernet/xilinx/ll_temac_main.c
drivers/of/address.c
drivers/of/base.c
drivers/of/of_pci_irq.c
drivers/spi/spi-fsl-espi.c
drivers/spi/spi-mpc512x-psc.c
drivers/tty/serial/cpm_uart/cpm_uart_core.c
include/linux/of.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index d86076431af668f34931cff162ebc698bc1f1b49,8e92acd8253f89b8505892a816b7fbc53d537285..8736bc7676c5d84b78cd42462fda90982ca079d9
@@@ -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
   *
Simple merge
Simple merge
Simple merge