diff options
author | Olof Johansson <olof@lixom.net> | 2012-12-12 16:09:22 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-12-12 16:10:00 -0800 |
commit | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (patch) | |
tree | 59976175d70b6e08aacd4abf7090919d3b78fc29 /arch/arm/plat-mxc/ulpi.c | |
parent | 5c1af2a7011bf719807de360cb64c2f610269a38 (diff) | |
parent | fb6842a7bc44bf719bfe85d5819a153d7c215510 (diff) |
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>
Diffstat (limited to 'arch/arm/plat-mxc/ulpi.c')
0 files changed, 0 insertions, 0 deletions