| tag | 2a03d96acc86401030dcbea2cf027e78d4570c33 | |
|---|---|---|
| tagger | John W. Linville <linville@tuxdriver.com> | Thu May 21 11:19:14 2015 -0400 |
| object | e2037531df04370796ddc111416d38cde365acb5 |
wireless-testing 2015-05-21
| commit | e2037531df04370796ddc111416d38cde365acb5 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu May 21 11:18:13 2015 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu May 21 11:18:13 2015 -0400 |
| tree | 6a10b063108153d2082f1921b93c0581aa536eb4 | |
| parent | a13eea37a4e032396b3206c03fd9681ea2a57449 [diff] | |
| parent | c5a71688e1e56e155fb79b8d699322f4f0793cc8 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Conflicts: include/net/mac80211.h