summaryrefslogtreecommitdiff
path: root/net/mac80211/sta_info.h
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-11-13 10:39:04 -0800
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-11-13 10:39:04 -0800
commit9ea6c5885681e3d9ce9844ba9dc57371a5cfc6d2 (patch)
tree1c3c1861d4ec6e19d2eb761ec353d2d807935858 /net/mac80211/sta_info.h
parentb8969d1a506cdb8ed1e4ae474e931dfcba277da1 (diff)
parent62db99f4783ea34531fc344bd8c539d5d186f24d (diff)
parent8ab8b3e1837fc580b30263ed3c44dc34798714d9 (diff)
parent60ced4950c5059eff3f03027926eb5384f9923e1 (diff)
parent392809b25833548ccfc55e61b76c8451a5073216 (diff)
parentbbe5d7a93a39104be146f71b9b99af8fb65a6a2d (diff)
Merge branches 'torture.2014.11.03a', 'cpu.2014.11.03a', 'doc.2014.11.13a', 'fixes.2014.11.13a', 'signal.2014.10.29a' and 'rt.2014.10.29a' into HEAD
cpu.2014.11.03a: Changes for per-CPU variables. doc.2014.11.13a: Documentation updates. fixes.2014.11.13a: Miscellaneous fixes. signal.2014.10.29a: Signal changes. rt.2014.10.29a: Real-time changes. torture.2014.11.03a: torture-test changes.