| commit | 041b499bb1b88512b96b411a1695a86f32ee55d5 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Dec 02 12:57:23 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Dec 02 12:57:23 2013 -0500 |
| tree | 1622855f04c8733f31e49ee382d0a1ebea11540d | |
| parent | d5aedd7e1b2f024ced0486aeb730bc56875e5ac9 [diff] | |
| parent | 3c5da7eefce5835acfc73ebd0a4f961cdae4ae67 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes