| commit | 9479f95f320cb35cce17859d2c3a5d29679dad50 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Wed Apr 19 05:34:53 2017 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Wed Apr 19 05:34:53 2017 -0700 |
| tree | 3c64a859347ca5a5f662c2daff7345fe8cb670a3 | |
| parent | ee93732978a98fd6c1c86268fa2f0a0a7f4c74e5 [diff] | |
| parent | 7cae7ef89e360cd3dc139eaac2f480c25bc7bfa1 [diff] |
Merge tag 'sunxi-defconfig-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/defconfig Allwinner defconfig changes for 4.12 Some patches to enable new modules in the defconfig. * tag 'sunxi-defconfig-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: ARM: multi_v7_defconfig: Switch AXP20x driver from module to built-in ARM: multi_v7_defconfig: Enable AC100 RTC driver ARM: multi_v7_defconfig: Switch sunxi RSB driver from module to built-in ARM: sunxi_defconfig: Enable AC100 RTC driver Signed-off-by: Olof Johansson <olof@lixom.net>