summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/setup.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-08-27 15:13:51 -0700
committerOlof Johansson <olof@lixom.net>2014-08-27 15:14:05 -0700
commit0dc0d9e18e7d4076440bdab73410cdfc1337586a (patch)
tree9dba3b5e92fbecade9461ca5b87bf16a77f60ce3 /arch/x86/xen/setup.c
parente1e5b718436380042def7b3e22ac18c8f755fd4a (diff)
parent58b80ad6472c0fa12926dfa1f9103d3a326bdf18 (diff)
downloadlinux-0dc0d9e18e7d4076440bdab73410cdfc1337586a.tar.gz
linux-0dc0d9e18e7d4076440bdab73410cdfc1337586a.tar.bz2
linux-0dc0d9e18e7d4076440bdab73410cdfc1337586a.zip
Merge tag 'renesas-clock-fixes-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Merge "Renesas ARM Based SoC Clock Fixes For v3.17" from Simon Horman: * ARM: shmobile: r8a7791: add missing 0x0100 for SDCKCR This resolves a problem introduced by 4bfb358b1d6cdeff ("ARM: shmobile: Add r8a7791 legacy SDHI clocks") which was included in v3.15. This fix does not have any run-time affect at this time. * ARM: shmobile: r8a7790: add missing 0x0100 for SDCKCR This resolves a problem introduced by 9f13ee6f83c52065 ("ARM: shmobile: r8a7790: add div4 clocks") which was included in v3.11. This fix does not have any run-time affect at this time. * ARM: shmobile: sh73a0: Remove spurious 0x from SCIFB clock name This resolves a problem introduced by a0f7e7496d56ac2d ("ARM: shmobile: sh73a0: add CMT1 clock support for DT") which was included in v3.17-rc1. This fix does not have any run-time affect at this time as the clock in question is used by a SCIF device that is not enabled by default. * tag 'renesas-clock-fixes-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7791: add missing 0x0100 for SDCKCR ARM: shmobile: r8a7790: add missing 0x0100 for SDCKCR ARM: shmobile: sh73a0: Remove spurious 0x from SCIFB clock name Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/x86/xen/setup.c')
0 files changed, 0 insertions, 0 deletions