Merge tag 'sti-defconfig-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux...

Merge "STi defconfig for v3.20, round 1" from Maxime Coquelin:

Highlights:
-----------
 - Enable STiH407 USB PicoPHY in multi_v7_defconfig
 - Enable MiPHY28lp driver in multi_v7_defconfig

* tag 'sti-defconfig-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti:
  ARM: multi_v7_defconfig: Enable MiPHY28lp - ST's Generic (SATA, PCIe & USB3) PHY
  ARM: multi_v7_defconfig: Enable stih407 usb picophy

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge