Merge branch 'for-next/mtd'

Conflicts:
	drivers/mtd/core.c
	net/eth.c

1 files changed, 0 insertions, 2 deletions

diff --git a/net/eth.c b/net/eth.c
index cb59e76144..524fb8978c 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -380,8 +380,6 @@ void eth_unregister(struct eth_device *edev)
 	if (edev == eth_current)
 		eth_current = NULL;
 
-	dev_remove_parameters(&edev->dev);
-
 	if (IS_ENABLED(CONFIG_OFDEVICE))
 		free(edev->nodepath);