Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net' overlapped the renaming of a netlink attribute in net-next. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
ipw2x00 | ||
iwlegacy | ||
iwlwifi | ||
Kconfig | ||
Makefile |
Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net' overlapped the renaming of a netlink attribute in net-next. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
ipw2x00 | ||
iwlegacy | ||
iwlwifi | ||
Kconfig | ||
Makefile |