summaryrefslogtreecommitdiff
path: root/net/nfc
diff options
context:
space:
mode:
authorAmadeusz Sławiński <amadeusz.slawinski@tieto.com>2017-01-24 16:42:10 +0100
committerJohannes Berg <johannes.berg@intel.com>2017-01-26 09:50:44 +0100
commit731977e97b3697454a862fec656c2561eabc0b87 (patch)
tree3c85d71fd7c87cc92facb0c2dc7552cc8fcdd342 /net/nfc
parent42f82e2e62ae748a27741e63dbb035bfbe3353c9 (diff)
mac80211: use helper function to access ieee802_1d_to_ac[]
cleanup patch to make use of ieee80211_ac_from_tid() to retrieve ac from ieee802_1d_to_ac[] Signed-off-by: Amadeusz Sławiński <amadeusz.slawinski@tieto.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions
b13ecea5cda809f7b97d&id2=50f4d9bda9f8510db1392b4e832fca95c56295a1'>diff)
Merge branch 'akpm' (patches from Andrew)
Merge final set of updates from Andrew Morton: - a series to make IMA play better across kexec - a handful of random fixes * emailed patches from Andrew Morton <akpm@linux-foundation.org>: printk: fix typo in CONSOLE_LOGLEVEL_DEFAULT help text ratelimit: fix WARN_ON_RATELIMIT return value kcov: make kcov work properly with KASLR enabled arm64: setup: introduce kaslr_offset() mm: fadvise: avoid expensive remote LRU cache draining after FADV_DONTNEED ima: platform-independent hash value ima: define a canonical binary_runtime_measurements list format ima: support restoring multiple template formats ima: store the builtin/custom template definitions in a list ima: on soft reboot, save the measurement list powerpc: ima: send the kexec buffer to the next kernel ima: maintain memory size needed for serializing the measurement list ima: permit duplicate measurement list entries ima: on soft reboot, restore the measurement list powerpc: ima: get the kexec buffer passed by the previous kernel
Diffstat (limited to 'include/uapi/asm-generic/mman.h')