diff options
author | Olof Johansson <olof@lixom.net> | 2015-01-12 14:32:47 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-01-12 14:32:47 -0800 |
commit | 58bdda1b571ffeab50874ca851d7473b3d10d03c (patch) | |
tree | 484be483fa78ccb7a77fc145421a5ec05cd02114 /include/linux/mfd/syscon/atmel-matrix.h | |
parent | eaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff) | |
parent | 09bd745b555c262d1e2c851777317f3adf3cf3d4 (diff) | |
download | talos-obmc-linux-58bdda1b571ffeab50874ca851d7473b3d10d03c.tar.gz talos-obmc-linux-58bdda1b571ffeab50874ca851d7473b3d10d03c.zip |
Merge tag 'renesas-sh73a0-ccf-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers
Merge "Renesas ARM Based SoC sh73a0 CCF Updates for v3.20" from Simon Horman:
* Add sh73a0 CCF support
* tag 'renesas-sh73a0-ccf-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: sh73a0: disable legacy clock initialization
ARM: shmobile: sh73a0: add MSTP clock assignments to DT
ARM: shmobile: kzm9g-reference: Common clock framework DT description
ARM: shmobile: sh73a0: Common clock framework DT description
ARM: shmobile: sh73a0: Add CPG register bits header
clk: shmobile: sh73a0 common clock framework implementation
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/mfd/syscon/atmel-matrix.h')
0 files changed, 0 insertions, 0 deletions