diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 18:58:40 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2019-09-03 18:58:41 +0200 |
commit | 597b97903543028cf6b708460b634f43762b3432 (patch) | |
tree | 70d6ec7a403c867cdff06b2361587ed82c2f30e3 /block/partitions/mac.c | |
parent | 9414d65d8b7ea41fa4062642910711cf434ae923 (diff) | |
parent | 4cdabee7d6d2e439fea726a101e448c4ca6837f4 (diff) |
Merge tag 'aspeed-5.4-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/defconfig
ASPEED defconfig updates for 5.4
- Enable the new AST2600 in multi_v7 and the aspeed_g5 configs.
- Regenerate defconfigs to drop old options
- Clean up network options
* tag 'aspeed-5.4-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
ARM: configs: aspeed_g5: Enable AST2600
ARM: configs: multi_v7: Add ASPEED G6
ARM: configs: aspeed: Refresh defconfigs
ARM: configs: aspeed: Enable commonly used network functionality
Link: https://lore.kernel.org/r/CACPK8XdyWzghA0QPDzA_MK5FYwhT5afqDJHNdhc8mfD2uk8MfQ@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'block/partitions/mac.c')
0 files changed, 0 insertions, 0 deletions