Learn more about cloning repositories
You have read-only access
Merge branch 'master' of ../net-2.6/ Conflicts: net/ipv6/ndisc.c
