diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-14 22:38:05 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-14 22:38:05 +0400 |
| commit | eb90217750136e4712f1d87a33e1951b80a1a365 (patch) | |
| tree | 29b9009eb399fdab7da6647dee6688ac4a56f0f9 /crypto/ablk_helper.c | |
| parent | f53f41597e57d6989dbefdd494a36867292499aa (diff) | |
| parent | db455c786886465c4d7fcd012fe2684b4c887776 (diff) | |
| download | linux-eb90217750136e4712f1d87a33e1951b80a1a365.tar.xz | |
Merge tag 'renesas-soc-fixes-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
From Simon Horman:
Renesas ARM Based SoC Fixes for v3.14
* r8a7790 (R-Car H2) SoC
- Correct I2C controller names
This fixes the issue introduced by
b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support"
which is queued-up for v3.14.
* tag 'renesas-soc-fixes-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7790: Fix I2C controller names
Diffstat (limited to 'crypto/ablk_helper.c')
0 files changed, 0 insertions, 0 deletions