commit | 9b8ba9f518829f7b7776e3b1f8c9f83c9696cf28 | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Tue Mar 04 13:34:08 2014 -0500 |
committer | John W. Linville <linville@tuxdriver.com> | Tue Mar 04 13:34:08 2014 -0500 |
tree | f278b61c99f3b8a92bedf23d55f52127da8657d8 | |
parent | b6251243ac0a3cb63afe748133f6600f77526078 [diff] | |
parent | acfcd9ed588465e48efe5ceb67177096d51c95a9 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes