]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit60d537e0f45d4ad899439cb685b41090b4b74f53
tree3e03335cf001019a2687d161e956de4f73379984
parentbc95580c5d418c0ca3a1a8a97d1ae33599a4c41a
parent3bc10b3935504614243e9425dc6e396b11629cef
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