summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-05-22 17:53:27 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2014-05-22 17:53:27 (GMT)
commit2c316e699fa40f2fc161ebb770b6e2845db4f3b0 (patch)
tree6dce3aa33e10f92e9df01521daea72367084683e /net/mac80211
parent20b4f9c73ff4137d720c4f378e1a780ac6a6c04d (diff)
parent7bacc782270ff7db3b9f29fa5d24ad2ee1e8e81d (diff)
downloadlinux-2c316e699fa40f2fc161ebb770b6e2845db4f3b0.tar.xz
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'net/mac80211')
0 files changed, 0 insertions, 0 deletions