• Olof Johansson's avatar
    Merge branch 'fixes' into next/cleanup · afcf7924
    Olof Johansson authored
    Merging in fixes since there's a conflict in the omap4 clock tables caused by
    it.
    
    * fixes: (245 commits)
      ARM: highbank: fix cache flush ordering for cpu hotplug
      ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock
      arm: mvebu: Fix the irq map function in SMP mode
      Fix GE0/GE1 init on ix2-200 as GE0 has no PHY
      ARM: S3C24XX: Fix interrupt pending register offset of the EINT controller
      ARM: S3C24XX: Correct NR_IRQS definition for s3c2440
      ARM i.MX6: Fix ldb_di clock selection
      ARM: imx: provide twd clock lookup from device tree
      ARM: imx35 Bugfix admux clock
      ARM: clk-imx35: Bugfix iomux clock
      + Linux 3.9-rc6
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    
    Conflicts:
    	arch/arm/mach-omap2/cclock44xx_data.c
    afcf7924
common.h 4.89 KB