Merge tag 'armsoc/for-3.15/drivers' of git://github.com/broadcom/mach-bcm into next...
authorArnd Bergmann <arnd@arndb.de>
Thu, 6 Mar 2014 04:53:03 +0000 (05:53 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 6 Mar 2014 04:53:03 +0000 (05:53 +0100)
Merge "ARM: mach-bcm: bcm281xx clock driver" from Matt Porter:

This pull request contains the Broadcom bcm281xx
clock driver series. This series is being merged
through the arm-soc tree because there is an
ordering dependency where the driver *must* be
merged before the related dts changes. This is
a result of the bcm281xx dts already containing
dummy fixed clock nodes that must be updated.

* tag 'armsoc/for-3.15/drivers' of git://github.com/broadcom/mach-bcm:
  clk: bcm281xx: don't disable unused peripheral clocks
  clk: bcm281xx: add initial clock framework support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge