Skip to content
Commit f58350eb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-defconfig-for-v3.20' of...

Merge tag 'renesas-defconfig-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Merge "Renesas ARM Based SoC Defconfig Updates for v3.20" from Simon Horman:

* Enable DA9063, MICREL_PHY and MTD_BLOCK watchdog in multiplatform defconfig
* Update AK8975 config option in kzm9g defconfig

* tag 'renesas-defconfig-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Enable DA9063 watchdog in multiplatform defconfig
  ARM: shmobile: Enable MICREL_PHY in shmobile_defconfig
  ARM: shmobile: defconfig: add MTD_BLOCK
  ARM: shmobile: defconfig: cleanup by savedefconfig
  ARM: shmobile: kzm9g_defconfig: Update AK8975 config option

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents eaa27f34 db54d850
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment