mirror_iproute2/bridge
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
..
.gitignore Add bridge command 2012-08-01 15:23:49 -07:00
br_common.h bridge: colorize output and use JSON print library 2018-02-21 08:41:31 -08:00
bridge.c Merge branch 'iproute2-master' into iproute2-next 2018-03-13 17:48:10 -07:00
fdb.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
link.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
Makefile SPDX license identifiers 2017-11-24 12:21:35 -08:00
mdb.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
monitor.c scrub out whitespace issues 2016-03-27 10:50:14 -07:00
vlan.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00