Learn more about cloning repositories
You have read-only access
Merge upstream into 'upstream' branch of netdev-2.6.git. Hand fix merge conflict in drivers/net/tokenring/Kconfig.
