From: Kevin Hilman <khilman@linaro.org>
Date: Tue, 14 Jan 2014 18:38:05 +0000 (-0800)
Subject: Merge tag 'renesas-soc-fixes-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~8207^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb90217750136e4712f1d87a33e1951b80a1a365;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'renesas-soc-fixes-for-v3.14' of git://git./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
---

eb90217750136e4712f1d87a33e1951b80a1a365