• Arnd Bergmann's avatar
    Merge tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu into next/multiplatform · 3081dc9e
    Arnd Bergmann authored
    Merge "mvebu soc for 4.5 (part 1)" from Gregory CLEMENT:
    
    - orion5x/mv78xx0 multiplatform conversion
    - legacy dove PMU support conversion
    
    * tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu:
      ARM: dove: convert legacy dove to PMU support
      soc: dove: add legacy support to PMU driver
      ARM: orion5x: multiplatform support
      ARM: orion5x: clean up mach/*.h headers
      ARM: mv78xx0: multiplatform support
      ARM: mv78xx0: clean up mach/*.h headers
      ARM: orion: use SPARSE_IRQ everywhere
      ARM: orion: always use MULTI_IRQ_HANDLER
      ARM: orion: move watchdog setup to mach-orion5x
    
    Conflicts:
    	arch/arm/Kconfig
    	arch/arm/mach-dove/include/mach/entry-macro.S
    	arch/arm/mach-orion5x/include/mach/entry-macro.S
    3081dc9e
Kconfig 60.4 KB