commit | 59731bb8c4f1536c5b698dc1aec82d7a5cef41eb | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Wed Jun 26 20:00:11 2013 -0400 |
committer | John W. Linville <linville@tuxdriver.com> | Wed Jun 26 20:00:11 2013 -0400 |
tree | b6e245cfae009fe9e108d6adaed3e0f56fd2969e | |
parent | 729d8d182bbf296b32cb2e7f970801eb6ce33c6a [diff] | |
parent | bd4ace2a36e7c87bb5f3eceb54d3b304d395dcf0 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next