]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'mvebu/seb_clk' into for-next
authorJason Cooper <jason@lakedaemon.net>
Mon, 20 May 2013 20:37:29 +0000 (20:37 +0000)
committerJason Cooper <jason@lakedaemon.net>
Mon, 20 May 2013 20:37:29 +0000 (20:37 +0000)
commita6a3067b1c0faae8747661786570233167198d63
tree890dbc5a31631819eef3e0a0760e1a3910b2abd3
parentaa826a64949ae0b31f9c6e8ea60805f3359f169a
parent54535d529b14786382e0f46f13652e170493b5a4
Merge branch 'mvebu/seb_clk' into for-next

Conflicts:
drivers/clk/mvebu/clk-gating-ctrl.c
 - remove file, hand edit:
     drivers/clk/mvebu/armada-370.c
     drivers/clk/mvebu/armada-xp.c
   to add pex{0,1}_en, and pex{0,1,2,3}
arch/arm/mach-kirkwood/Kconfig
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-mvebu/Kconfig
arch/arm/mach-mvebu/armada-370-xp.c
drivers/clk/mvebu/armada-370.c
drivers/clk/mvebu/armada-xp.c