Merge remote-tracking branch 'tile/master'

diff --cc arch/tile/include/asm/pci.h
index 32e6cbe8dff3350d1d7e236691fced9a47bd2c8d,1c31a2f541341f346ad76c8ecf4ab88dd6260a31..dd1aa097c106bf908e79bd25ec2fc440a7854bc4
--- 1/arch/tile/include/asm/pci.h
--- 2/arch/tile/include/asm/pci.h
+++ b/arch/tile/include/asm/pci.h
@@@ -47,15 -134,11 +134,11 @@@ extern void pci_iounmap(struct pci_dev 
   */
  #define PCI_DMA_BUS_IS_PHYS     1
  
 -int __devinit tile_pci_init(void);
 -int __devinit pcibios_init(void);
 +int __init tile_pci_init(void);
 +int __init pcibios_init(void);
  
- static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {}
- 
  void __devinit pcibios_fixup_bus(struct pci_bus *bus);
  
- #define       TILE_NUM_PCIE   2
- 
  #define pci_domain_nr(bus) (((struct pci_controller *)(bus)->sysdata)->index)
  
  /*

diff --cc mm/hugetlb.c
Simple merge