Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
authorPatrick McHardy <kaber@trash.net>
Fri, 14 Jan 2011 13:12:37 +0000 (14:12 +0100)
committerPatrick McHardy <kaber@trash.net>
Fri, 14 Jan 2011 13:12:37 +0000 (14:12 +0100)
commit0134e89c7bcc9fde1da962c82a120691e185619f
tree3e03335cf001019a2687d161e956de4f73379984
parentc7066f70d9610df0b9406cc635fc09e86136e714
parent6faee60a4e82075853a437831768cc9e2e563e4e
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6

Conflicts:
net/ipv4/route.c

Signed-off-by: Patrick McHardy <kaber@trash.net>
include/net/dst.h
net/ipv4/fib_semantics.c
net/ipv4/route.c