| tag | 1fcd44d848748ba7ee4cc403857cc8cd25ca9066 | |
|---|---|---|
| tagger | John W. Linville <linville@tuxdriver.com> | Fri Feb 06 11:16:18 2015 -0500 |
| object | adf9cb99c170de9529518480f0d77cff69cb0212 |
wireless-testing 2015-02-06
| commit | adf9cb99c170de9529518480f0d77cff69cb0212 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Feb 06 11:15:03 2015 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Feb 06 11:15:03 2015 -0500 |
| tree | 67340e7fda1541c355d39df4bb922f7ad13219d3 | |
| parent | 01619fc5756eac8c0d563764170c0897c548ce12 [diff] | |
| parent | d53071143aa5a7cb37cf7db8101042e700b5413f [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next Conflicts: drivers/net/wireless/rtlwifi/pci.c