| commit | 9ffddb1a93d732bb098e1833733624231c73dd72 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Jun 22 14:40:38 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Jun 22 14:40:38 2012 -0400 |
| tree | 75e592956c34c567b801db3dba9f5be26fd4e38b | |
| parent | 133189a46c2c522eb4ef26b1ede63dd0a9fdc920 [diff] | |
| parent | e75dac921d88ac1fa1ad08686ab242556f8b888b [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next