tree 8ccd7c668c7fbd8f08cb89426006040217caf3f1
parent 9bd512f619cc116b7830134d7c9f6e404a38c7bf
parent 8f3ea33a5078a09eba12bfe57424507809367756
author David S. Miller <davem@davemloft.net> 1206338043 -0700
committer David S. Miller <davem@davemloft.net> 1206338043 -0700

Merge branch 'master' of ../net-2.6/

Conflicts:

	net/ipv6/ndisc.c