summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-07-09 16:35:18 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-07-09 16:35:18 -0400
commitfd2841c5b59c276796f730b77ef37408c0909f9c (patch)
tree34329300850e4addad576325840b6715e6894a9a /drivers/net/wireless/mwifiex
parent0af5491c2f6069bb6cff4260619749a90a208c98 (diff)
parent0ff1bd35f5aece42879b04cbfe6b4040cf50a697 (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/mwifiex')
0 files changed, 0 insertions, 0 deletions