]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clk/clk-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 06:14:15 +0000 (16:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 06:14:15 +0000 (16:14 +1000)
commit8710aa9a8a9c1def4f97041121bde07429e1d585
tree77559682a917d9d206d58f9cb8fca9d688b2f80d
parentdec19d34c26e5c8fe808366d63f7ffbb8c6a511a
parent494bfec99922d54054d2d0873f1017680cfc3f13
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
arch/arm/mach-ux500/clock.c
arch/arm/Kconfig
arch/arm/mach-realview/core.c
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_pb1176.c
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mach-realview/realview_pba8.c
arch/arm/mach-realview/realview_pbx.c
arch/arm/mach-ux500/Kconfig
arch/arm/mach-ux500/cpu.c