mirror_iproute2/man
David Ahern e9625d6aea Merge branch 'iproute2-master' into iproute2-next
Conflicts:
	bridge/mdb.c

Updated bridge/bridge.c per removal of check_if_color_enabled by commit
1ca4341d2c ("color: disable color when json output is requested")

Signed-off-by: David Ahern <dsahern@gmail.com>
2018-03-13 17:48:10 -07:00
..
man3 SPDX license identifiers 2017-11-24 12:21:35 -08:00
man7 SPDX license identifiers 2017-11-24 12:21:35 -08:00
man8 Merge branch 'iproute2-master' into iproute2-next 2018-03-13 17:48:10 -07:00
Makefile SPDX license identifiers 2017-11-24 12:21:35 -08:00