diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2013-02-12 12:51:08 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-12 12:51:08 -0500 |
| commit | 5171f7a0b79dfbc61a6e12f20f6eef6d7dd5b2a8 (patch) | |
| tree | 50e48f8b65bc10fd7b8959735cb599884a161d1b /drivers/bcma | |
| parent | rtlwifi: Initialize rate_init member of struct rate_control_ops (diff) | |
| parent | iwlwifi: mvm: beautify code in rx_handlers (diff) | |
| download | linux-dev-5171f7a0b79dfbc61a6e12f20f6eef6d7dd5b2a8.tar.xz linux-dev-5171f7a0b79dfbc61a6e12f20f6eef6d7dd5b2a8.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
Diffstat (limited to 'drivers/bcma')
0 files changed, 0 insertions, 0 deletions