commit | c046555966e4a3a75b731e05ece3b1d763ac56ae | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Tue Nov 05 15:53:10 2013 -0500 |
committer | John W. Linville <linville@tuxdriver.com> | Tue Nov 05 15:53:10 2013 -0500 |
tree | 2957e97a4052ca069ff7d05abf49e6b9647be9e7 | |
parent | dce1ebabcb0ac12113487221663c2aba648dd244 [diff] | |
parent | c92f06a1dea1e444213d860a20023f72c134e20a [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next