| commit | 37267675c9f0037b550d6c4c253a669fb728dfe5 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Fri Apr 03 13:06:52 2015 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Fri Apr 03 13:06:52 2015 -0700 |
| tree | 3af1096234066b56aa515fbd9a055c400c606390 | |
| parent | f28ae3ba10f3d9535289e7902293c52a494ed476 [diff] | |
| parent | a198d27cb4d34de1fde22989c5fa536a951f6303 [diff] |
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>