summaryrefslogtreecommitdiffstats
path: root/drivers/bcma
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-09-07 14:50:15 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-09-07 14:50:15 -0400
commit0374737727b65f31b9357051b421a3141c0d39ec (patch)
tree0b3cb3b10ce83232c154f277007479ea66f23182 /drivers/bcma
parent4a3e12fd7a106bdf092704ea10ff463d2309213a (diff)
parentc5d472212024543e32cf3eea4381ab91b9f6b812 (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