• Linus Torvalds's avatar
    Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 81bc3009
    Linus Torvalds authored
    arm-soc fixes for 3.3-rc:
    
    AT91 needed reset fixes which resulted in some minor code refactoring,
    it also adds a feature-removal for one of their platforms for 3.4.
    The USB patches have been acked by Greg K-H.
    
    i.MX and ux500 both have some minor fixes, nothing controversial.
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
      ARM: imx: iomux-v1.h: Fix build error due to __init annotation
      ARM: at91: Fix at91sam9g45 and at91cap9 reset
      ARM: at91: make rstc soc independent
      ARM: at91: introduce AT91_SAM9_ALT_RESET to select the at91sam9 alternative reset
      ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h
      ARM: at91: fix cap9 ddrsdr register
      ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low
      USB: at91: fix clk_get error handling
      ARM: at91: removal of CAP9 SoC family
      ARM: at91: fix at91rm9200 soc subtype handling
      mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball
      mach-ux500: enable ARM errata 764369
      mach-ux500: do not override outer.inv_all
      mach-ux500: musb: now musb is always in OTG mode
      ARM: imx6: add missing twd_clk for imx6q clock
    81bc3009
mach-mx53_ard.c 7.13 KB