diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
commit | 294cbd05e32990c3b1a62be27441fc719edebbab (patch) | |
tree | 9e543bcfdaa183343f18714a256d3fd5c88d3b5c /net/mac80211/trace.c | |
parent | be96b316deff35e119760982c43af74e606fa143 (diff) | |
parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/mac80211/trace.c')
-rw-r--r-- | net/mac80211/trace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/trace.c b/net/mac80211/trace.c index edfe0c170a1c..837857261b66 100644 --- a/net/mac80211/trace.c +++ b/net/mac80211/trace.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* bug in tracepoint.h, it should include this */ #include <linux/module.h> |