commit | cfa9c3fba738031ae107039ed7da0819f2c02502 | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Thu Jan 23 14:00:51 2014 -0500 |
committer | John W. Linville <linville@tuxdriver.com> | Thu Jan 23 14:00:51 2014 -0500 |
tree | da94fedf2f79af10150e23c930208b1e66f78df5 | |
parent | e4e19c031901e95dc7d1cf0a2c9c50525d71651f [diff] | |
parent | 23e76d1a516eef416fb5c038791e943fc0916b67 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next