summaryrefslogtreecommitdiffstats
path: root/include/linux/nvram.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-12-04 14:43:05 +0100
committerJohannes Berg <johannes.berg@intel.com>2015-12-04 14:43:05 +0100
commitd9d3ac7afd7a5349271521fb9693230b4da66f1e (patch)
tree59f1a146ba05e228bc7f9cd8ac02b478f6a59ab9 /include/linux/nvram.h
parent0ba44351025f8f6aa279a7e4feb5e23429801c10 (diff)
parentc1df932c0574c13ab3ce72e969c9647ff3aaad68 (diff)
downloadblackbird-op-linux-d9d3ac7afd7a5349271521fb9693230b4da66f1e.tar.gz
blackbird-op-linux-d9d3ac7afd7a5349271521fb9693230b4da66f1e.zip
Merge remote-tracking branch 'mac80211/master' into HEAD
I want to get the full off-channel bugfix since later code depends on it, as well as the AP client state change so I can revert it correctly. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/linux/nvram.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud