Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes

From Andrew Lunn <[email protected]>:

* 'v3.5-rc7-fixes' of git://github.com/lunn/linux:
  ARM: Kirkwood: Replace mrvl with marvell
  ARM: Orion: fix driver probe error handling with respect to clk
  ARM: Dove: Fixup ge00 initialisation
  ARM: Kirkwood: Fix PHY disable clk problems
  ARM: Kirkwood: Ensure runit clock always ticks.

Signed-off-by: Arnd Bergmann <[email protected]>

diff --cc drivers/net/ethernet/marvell/mv643xx_eth.c
Simple merge