summaryrefslogtreecommitdiffstats
path: root/drivers/bcma
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-09-04 13:45:56 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-09-04 13:45:56 -0400
commitd17ec4d55223d9487df195012762da6f85862d4c (patch)
tree7dd8d60ed5f642add44b53f67c5a987b1145a030 /drivers/bcma
parentef4ead3f29256ed83991cd77b39334aadd25672a (diff)
parent712b24adc105518f7cbbb6f9f353efea48954bb9 (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/bcma')
0 files changed, 0 insertions, 0 deletions