Learn more about cloning repositories
You have read-only access
Merge ../linus Conflicts: drivers/char/agp/Kconfig