diff options
author | Olof Johansson <olof@lixom.net> | 2013-06-07 18:10:42 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-06-07 18:11:02 -0700 |
commit | fb565ff7c885893dd33ba48f730d32b50aa350ea (patch) | |
tree | 0a7e3d2b2a90637e354f0dfbf48a7580d9c61eba /fs/pstore | |
parent | 437d8ac510b90610da814ae25a7b79aaf3b4910f (diff) | |
parent | 5600a8485603b240790005b9b58de4c4f6ada69d (diff) | |
download | blackbird-op-linux-fb565ff7c885893dd33ba48f730d32b50aa350ea.tar.gz blackbird-op-linux-fb565ff7c885893dd33ba48f730d32b50aa350ea.zip |
Merge tag 'renesas-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
From Simon Horman, Renesas ARM based SoC fixes for v3.10:
- Correction to USB OVC and PENC pin groupings on r8a7779 SoC.
This avoids conflicts when the USB_OVCn pins are used by another function.
This has been observed to be a problem in v3.10-rc1.
- Update CMT clock rating for sh73a0 SoC to resolve boot failure
on kzm9g-reference. This resolves a regression between v3.9 and v3.10-rc1.
* tag 'renesas-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: sh73a0: Update CMT clockevent rating to 80
sh-pfc: r8a7779: Don't group USB OVC and PENC pins
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/pstore')
0 files changed, 0 insertions, 0 deletions