summaryrefslogtreecommitdiff
path: root/net/mac80211/sta_info.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 13:12:14 (GMT)
committerMark Brown <broonie@kernel.org>2014-12-08 13:12:14 (GMT)
commitcabad441830005a4c656812915b0e803d5a65d30 (patch)
tree9e954b8e08ab34001b5227d889d4b7e9c263bbfa /net/mac80211/sta_info.h
parent631657c61da1ce9705f2df0c61b3879ad613267b (diff)
parent5ad72152b695ba5027f9c6ec9a48a8e1a70f25dc (diff)
parent815b776cf5983ab69d548146fb979adac5dec4de (diff)
parent2062c1ff3596e1ae8aafe8082460d03d9a420282 (diff)
parentcfbb77ce368b8d4181e06f8982a440702567eb98 (diff)
parent8865051d9941de905432f59f7a88662e824d5df9 (diff)
downloadlinux-cabad441830005a4c656812915b0e803d5a65d30.tar.xz
Merge remote-tracking branches 'asoc/topic/ssm4567', 'asoc/topic/sta32x', 'asoc/topic/sta350', 'asoc/topic/sta529' and 'asoc/topic/stac9766' into asoc-next