Merge tag 'renesas-defconfig-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel...

Merge tag 'renesas-defconfig-for-v4.6' of git://git./linux/kernel/git/horms/renesas into next/defconfig

Renesas ARM Based SoC Defconfig Updates for v4.6

* Enable XHCI_RCAR
* Do not enable CONFIG_CPU_BPREDICT_DISABLE

* tag 'renesas-defconfig-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: Enable XHCI_RCAR
  ARM: shmobile: enable XHCI_RCAR in defconfig
  ARM: shmobile: defconfig: Do not enable CONFIG_CPU_BPREDICT_DISABLE

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