Learn more about cloning repositories
You have read-only access
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/macintosh/adbhid.c