commit | 2437f3c5d6bc07252c6d7d24448755e0c35ed91c | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Fri Aug 09 15:07:23 2013 -0400 |
committer | John W. Linville <linville@tuxdriver.com> | Fri Aug 09 15:07:23 2013 -0400 |
tree | 940f14508ecb7ca4a46206623c56adf9510918e1 | |
parent | 4f0544489215fc78cccb96f8e3d0f078ae965297 [diff] | |
parent | ef4394b9477f9078d78ae3e8359eae094c9b19d8 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next