Learn more about cloning repositories
You have read-only access
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: fs/cifs/inode.c