diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-04 06:00:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-04 06:00:17 +0200 |
| commit | 6f41617bf23a17d9cb7cc6ca8161534f05f80293 (patch) | |
| tree | 2844d8d197a61b0603e31f09613e3272635dd1cc /net/mac80211/util.c | |
| parent | Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe... (diff) | |
| parent | Merge gitolite.kernel.org:/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-6f41617bf23a17d9cb7cc6ca8161534f05f80293.tar.xz linux-6f41617bf23a17d9cb7cc6ca8161534f05f80293.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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>
Diffstat (limited to 'net/mac80211/util.c')
0 files changed, 0 insertions, 0 deletions