| commit | aa4a625088f9117f3bebfc21943c3d5d8a4cf81e | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Mar 18 16:55:28 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Mar 18 16:55:28 2014 -0400 |
| tree | f8ca315db51fa142920983f18160047c4d179d43 | |
| parent | 2df3b0b7869688c511eada859f1ee3dc13c7cec6 [diff] | |
| parent | a82dda6cd492b8c88952be6f6527f3656f7ac585 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next