Merge tag 'mtu-clk-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Nov 2012 16:14:37 +0000 (17:14 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Nov 2012 16:14:37 +0000 (17:14 +0100)
commit794c1539ab391e1278bec0d69015d9b4e75bdaf0
treed2c2259afc46f724cc288eb13e82aa953c3a633a
parentf75ed2d39562e19e4d1896c07e7f091515c6d11d
parent16defa668d009a762e23d55ce6ecf5ae483dfe10
Merge tag 'mtu-clk-for-arm-soc' of git://git./linux/kernel/git/linusw/linux-stericsson into next/multiplatform

From Linus Walleij <linus.walleij@linaro.org>:

This tag contains two MTU patches based on top of the ux500 sparse IRQ
commit to avoid merge clashes.

* tag 'mtu-clk-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  clocksource/mtu-nomadik: use apb_pclk
  clk: ux500: Register mtu apb_pclocks

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