| commit | 0b21eb9ad7712f6ad5a2b522c886e8f7f6fd867d | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jun 18 14:43:50 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jun 18 14:43:50 2013 -0400 |
| tree | a30d91122ea014844a2b6562c13982ebf084cc21 | |
| parent | 9d1059c2481885ba7a2af02fc1bf87cae88b302a [diff] | |
| parent | 8a487b1a7432b20ff3f82387a8ce7555a964b44e [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes