Learn more about cloning repositories
You have read-only access
Merge branch 'upstream-fixes' into upstream Conflicts: drivers/net/e1000/e1000_ethtool.c