Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes
authorArnd Bergmann <arnd@arndb.de>
Wed, 25 Jul 2012 19:37:09 +0000 (21:37 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 25 Jul 2012 19:37:09 +0000 (21:37 +0200)
commitc1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7
treefd013d6f38b25fd1c3890a7f4ad9aa25311e7f54
parent49121304a9831449a841ca0c77dc0ad8697e23c9
parent778435045a416da71f1757a80e37200a5ea5af70
Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes

From Andrew Lunn <andrew@lunn.ch>:

* '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 <arnd@arndb.de>
drivers/net/ethernet/marvell/mv643xx_eth.c