| tag | f917cb30ad81e6b3fdf0184ea31cf291c428b9db | |
|---|---|---|
| tagger | John W. Linville <linville@tuxdriver.com> | Fri Jan 16 10:41:40 2015 -0500 |
| object | ba3f765b058afec08f5aabb9410460b732d08d61 |
wireless-testing 2015-01-16
| commit | ba3f765b058afec08f5aabb9410460b732d08d61 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Jan 16 10:27:27 2015 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Jan 16 10:27:27 2015 -0500 |
| tree | ebf12270a37e25876beb2466b2fa317a49bc24bd | |
| parent | 2a3c476e423cc0120faadc581a978dcd179c6483 [diff] | |
| parent | d0c102f70aec07eaeb23de30892f425e4c5f6045 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next Conflicts: drivers/net/wireless/ath/wil6210/cfg80211.c drivers/net/wireless/iwlwifi/mvm/scan.c