| commit | 6de3f7e911d27d6737c79b3f6b5069044ea408ec | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Aug 22 14:15:47 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Aug 22 14:15:47 2012 -0400 |
| tree | 186dcf1897be76a4155f5a22a7f242c29f328c5a | |
| parent | 33dd7699cefd175c3a5d3d6077db9c8d8322c9a7 [diff] | |
| parent | 40503f7b48260a91ab65a4f8b00a2c6f004fa807 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next