From: Olof Johansson Date: Fri, 3 Apr 2015 20:06:52 +0000 (-0700) Subject: Merge tag 'sunxi-defconfig-for-4.1' of https://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v4.1-rc1~47^2~8 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=37267675c9f0037b550d6c4c253a669fb728dfe5;p=linux.git 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 --- 37267675c9f0037b550d6c4c253a669fb728dfe5