Merge tag 'berlin-new-cpuclk-for-4.4-1' of git://git.infradead.org/users/hesselba...
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Oct 2015 20:41:04 +0000 (22:41 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Oct 2015 20:41:04 +0000 (22:41 +0200)
Merge "Marvell Berlin BG2Q CPU clock driver" from Sebastian Hesselbarth:

- add BG2Q CPU clock to clk driver

* tag 'berlin-new-cpuclk-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  clk: berlin: add cpuclk
  ARM: berlin: dts: add CLKID_CPU for BG2Q


Trivial merge