diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-10-06 11:46:32 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-10-06 11:46:55 +0200 |
| commit | 753d179ad001b25425beb977d00f2531540e7d42 (patch) | |
| tree | de61b9e3c86b71e9a654cea002b188f90b1f8ef6 /include/uapi/linux/fcntl.h | |
| parent | 503c1fb98ba3859c13863957c7c65c92371a9e50 (diff) | |
| parent | cc71b7b071192ac1c288e272fdc3f3877eb96663 (diff) | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merging this brings in the timer_setup() change, which allows
me to apply Kees's mac80211 changes for it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/uapi/linux/fcntl.h')
0 files changed, 0 insertions, 0 deletions