| commit | b1a9338d5eaa9c38c326e20ce339247f4d585b62 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Oct 05 11:14:58 2010 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Oct 05 11:14:58 2010 -0400 |
| tree | d2e48e2120e96c4427a5d6897312c15a0111c429 | |
| parent | 1728943d83e9fd919e454332fe344944123b3c3a [diff] | |
| parent | 62cb3c6ac47a5ab7d8c67dbbf8cbdcd5ae735410 [diff] |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6