Skip to content
Commit 06802a81 authored by David S. Miller's avatar David S. Miller
Browse files

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

Conflicts:

	net/ipv6/ndisc.c
parents 9bd512f6 8f3ea33a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment