Hand fix merge conflict in drivers/net/tokenring/Kconfig.
Attach a file by drag & drop or click to upload
