| commit | 06802a819a0a2d31c952c0624cea6cd00e4e50da | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Mar 23 22:54:03 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sun Mar 23 22:54:03 2008 -0700 |
| tree | 8ccd7c668c7fbd8f08cb89426006040217caf3f1 | |
| parent | 9bd512f619cc116b7830134d7c9f6e404a38c7bf [diff] | |
| parent | 8f3ea33a5078a09eba12bfe57424507809367756 [diff] |
Merge branch 'master' of ../net-2.6/ Conflicts: net/ipv6/ndisc.c