tree 3e03335cf001019a2687d161e956de4f73379984
parent c7066f70d9610df0b9406cc635fc09e86136e714
parent 6faee60a4e82075853a437831768cc9e2e563e4e
author Patrick McHardy <kaber@trash.net> 1295010757 +0100
committer Patrick McHardy <kaber@trash.net> 1295010757 +0100

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>