Learn more about cloning repositories
You have read-only access
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ Conflicts: include/linux/nfs_fs.h Fixed up conflict with kernel header updates.
