diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-06 05:53:03 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-06 05:53:03 +0100 |
| commit | 1f6e3763d0480f3338b27ea04f66ff5c6e8d0f12 (patch) | |
| tree | 05190589f68a87b568e38f1370b1a9fb8f31ee04 /drivers/watchdog | |
| parent | drivers: cci: Export CCI PMU revision (diff) | |
| parent | clk: bcm281xx: don't disable unused peripheral clocks (diff) | |
| download | linux-1f6e3763d0480f3338b27ea04f66ff5c6e8d0f12.tar.xz linux-1f6e3763d0480f3338b27ea04f66ff5c6e8d0f12.zip | |
Merge tag 'armsoc/for-3.15/drivers' of git://github.com/broadcom/mach-bcm into next/drivers
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>
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions