| commit | f0b5989745c3e0e92424d36869a97e4e8df7ab13 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Mar 29 21:25:29 2020 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sun Mar 29 21:25:29 2020 -0700 |
| tree | 0e9759b9d6060bb94cad676b1b16e423d5ad2523 | |
| parent | 1a147b74c2fd4058dea0133cb2471724c3b3de09 [diff] | |
| parent | 7111951b8d4973bda27ff663f2cf18b663d15b48 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Minor comment conflict in mac80211. Signed-off-by: David S. Miller <davem@davemloft.net>