diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2015-10-13 10:28:16 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-10-13 10:28:43 +0200 |
| commit | 985f2c87a7109a42cac93f56ea595353d53a1746 (patch) | |
| tree | 69fe0acbbfeb6a348d6f4c64750d278e56b935b3 /tools/perf/scripts/python/stat-cpi.py | |
| parent | mac80211: add missing struct ieee80211_txq tid field initialization (diff) | |
| parent | bridge: vlan: enforce no pvid flag in vlan ranges (diff) | |
| download | linux-dev-985f2c87a7109a42cac93f56ea595353d53a1746.tar.xz linux-dev-985f2c87a7109a42cac93f56ea595353d53a1746.zip | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge net-next to get some driver changes that patches depend
on (in order to avoid conflicts).
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'tools/perf/scripts/python/stat-cpi.py')
0 files changed, 0 insertions, 0 deletions