Merge tag 'sunxi-defconfig-for-4.1' of...

Merge tag 'sunxi-defconfig-for-4.1' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/defconfig

Merge "Allwinner defconfig changes for 4.1" from Maxime Ripard:

Nothing really standing out here, just a few options to enable in the defconfigs

* tag 'sunxi-defconfig-for-4.1' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi_defconfig: increase the number of maximum number of CPUs to 8
  ARM: multi_v7_defconfig: Enable CONFIG_PHY_SUN9I_USB
  ARM: sunxi_defconfig: Enable CONFIG_PHY_SUN9I_USB

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