From: Stephen Hemminger <shemming@brocade.com>
Date: Tue, 7 Apr 2015 15:56:14 +0000 (-0700)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.1.0~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd733e408853bd39eee4cb7e4355602e77feb82a;p=thirdparty%2Fiproute2.git

Merge branch 'master' into net-next

Conflicts:
	man/man8/ip-route.8.in
---

bd733e408853bd39eee4cb7e4355602e77feb82a