aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorJohn W. Linville2014-01-03 15:25:15 -0500
committerJohn W. Linville2014-01-03 15:25:15 -0500
commit55d1cad2efe2e3567c3116f50ba10e5af1bc01fc (patch)
tree5d09fc11643739c5266250383cffbe577a562ee5 /drivers/net/wireless/iwlwifi
parent39731b78b4afebb7501c05b68e2443a1b250b41c (diff)
parent32db6b54dfba38aa8fa4072b2a3fc6425139166a (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
0 files changed, 0 insertions, 0 deletions