tree 59976175d70b6e08aacd4abf7090919d3b78fc29
parent 5c1af2a7011bf719807de360cb64c2f610269a38
parent fb6842a7bc44bf719bfe85d5819a153d7c215510
author Olof Johansson <olof@lixom.net> 1355357362 -0800
committer Olof Johansson <olof@lixom.net> 1355357400 -0800

ARM: arm-soc: Merge branch 'next/clk' into next/pm

Merge together a couple of the smaller pm/clock branches into one.

Signed-off-by: Olof Johansson <olof@lixom.net>