Merge tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu into next/multipla...
commit3081dc9eff32519bc3298c6dba0b877675d4c1cd
authorArnd Bergmann <arnd@arndb.de>
Tue, 15 Dec 2015 23:57:08 +0000 (16 00:57 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 15 Dec 2015 23:57:08 +0000 (16 00:57 +0100)
treed4c1d2af14e09e96dd015fa9163df88106b11ddf
parent22ba14f41ca6b7f96fe3d4a8eb116358060595fd
parentc5d431e8c511788556651b91debd7d77d4508f4b
Merge tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu into next/multiplatform

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
arch/arm/Kconfig