diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-22 07:28:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-22 07:28:41 -0700 |
| commit | e9829b9745b6e1683fd2a90842da498a2197299e (patch) | |
| tree | 088466771298ed5d92b1b1b30a52204d37c2f4ff /drivers/perf | |
| parent | c7fc9eb79a89049214f9870a6cf978050aaea43a (diff) | |
| parent | e5a9f8d04660da7ef3a98260aa74c3976f9cb4cd (diff) | |
| download | talos-obmc-linux-e9829b9745b6e1683fd2a90842da498a2197299e.tar.gz talos-obmc-linux-e9829b9745b6e1683fd2a90842da498a2197299e.zip | |
Merge tag 'mac80211-next-for-davem-2015-10-21' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Here's another set of patches for the current cycle:
* I merged net-next back to avoid a conflict with the
* cfg80211 scheduled scan API extensions
* preparations for better scan result timestamping
* regulatory cleanups
* mac80211 statistics cleanups
* a few other small cleanups and fixes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/perf')
0 files changed, 0 insertions, 0 deletions
